Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 10 May 2016 10:24:35 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r299352 - head/sys/dev/mfi
Message-ID:  <201605101024.u4AAOZbZ075966@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;
 		}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605101024.u4AAOZbZ075966>