From owner-svn-src-all@freebsd.org  Tue May 10 10:24:36 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD419B35201;
 Tue, 10 May 2016 10:24:36 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A8C31FA5;
 Tue, 10 May 2016 10:24:36 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4AAOZMx075967;
 Tue, 10 May 2016 10:24:35 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4AAOZbZ075966;
 Tue, 10 May 2016 10:24:35 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201605101024.u4AAOZbZ075966@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 10 May 2016 10:24:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299352 - head/sys/dev/mfi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2016 10:24:36 -0000

Author: trasz
Date: Tue May 10 10:24:35 2016
New Revision: 299352
URL: https://svnweb.freebsd.org/changeset/base/299352

Log:
  Remove NULL check after M_WAITOK allocations from mfi(4).
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/mfi/mfi.c

Modified: head/sys/dev/mfi/mfi.c
==============================================================================
--- head/sys/dev/mfi/mfi.c	Tue May 10 10:21:03 2016	(r299351)
+++ head/sys/dev/mfi/mfi.c	Tue May 10 10:24:35 2016	(r299352)
@@ -3230,10 +3230,6 @@ mfi_ioctl(struct cdev *dev, u_long cmd, 
 		    (cm->cm_flags & (MFI_CMD_DATAIN | MFI_CMD_DATAOUT))) {
 			cm->cm_data = data = malloc(cm->cm_len, M_MFIBUF,
 			    M_WAITOK | M_ZERO);
-			if (cm->cm_data == NULL) {
-				device_printf(sc->mfi_dev, "Malloc failed\n");
-				goto out;
-			}
 		} else {
 			cm->cm_data = 0;
 		}
@@ -3527,10 +3523,6 @@ mfi_linux_ioctl_int(struct cdev *dev, u_
 		      (cm->cm_flags & (MFI_CMD_DATAIN | MFI_CMD_DATAOUT))) {
 			cm->cm_data = data = malloc(cm->cm_len, M_MFIBUF,
 			    M_WAITOK | M_ZERO);
-			if (cm->cm_data == NULL) {
-				device_printf(sc->mfi_dev, "Malloc failed\n");
-				goto out;
-			}
 		} else {
 			cm->cm_data = 0;
 		}