From owner-svn-src-all@freebsd.org  Sat Apr  7 21:31:09 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B14B1F873AC;
 Sat,  7 Apr 2018 21:31:09 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 5F41284910;
 Sat,  7 Apr 2018 21:31:09 +0000 (UTC) (envelope-from ian@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 59214263E9;
 Sat,  7 Apr 2018 21:31:09 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w37LV9Sk020078;
 Sat, 7 Apr 2018 21:31:09 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w37LV9fv020077;
 Sat, 7 Apr 2018 21:31:09 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201804072131.w37LV9fv020077@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Sat, 7 Apr 2018 21:31:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r332258 - head/sys/dev/spibus
X-SVN-Group: head
X-SVN-Commit-Author: ian
X-SVN-Commit-Paths: head/sys/dev/spibus
X-SVN-Commit-Revision: 332258
X-SVN-Commit-Repository: base
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.25
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: Sat, 07 Apr 2018 21:31:09 -0000

Author: ian
Date: Sat Apr  7 21:31:09 2018
New Revision: 332258
URL: https://svnweb.freebsd.org/changeset/base/332258

Log:
  Don't check for impossible NULL return from malloc(..., M_WAITOK).

Modified:
  head/sys/dev/spibus/spigen.c

Modified: head/sys/dev/spibus/spigen.c
==============================================================================
--- head/sys/dev/spibus/spigen.c	Sat Apr  7 21:25:29 2018	(r332257)
+++ head/sys/dev/spibus/spigen.c	Sat Apr  7 21:31:09 2018	(r332258)
@@ -242,15 +242,9 @@ spigen_transfer(struct cdev *cdev, struct spigen_trans
 #endif
 	transfer.tx_cmd = transfer.rx_cmd = malloc(st->st_command.iov_len,
 	    M_DEVBUF, M_WAITOK);
-	if (transfer.tx_cmd == NULL)
-		return (ENOMEM);
 	if (st->st_data.iov_len > 0) {
 		transfer.tx_data = transfer.rx_data = malloc(st->st_data.iov_len,
 		    M_DEVBUF, M_WAITOK);
-		if (transfer.tx_data == NULL) {
-			free(transfer.tx_cmd, M_DEVBUF);
-			return (ENOMEM);
-		}
 	}
 	else
 		transfer.tx_data = transfer.rx_data = NULL;