Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Dec 2015 03:55:02 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r292975 - stable/10/sys/dev/pci
Message-ID:  <201512310355.tBV3t2VG040656@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Thu Dec 31 03:55:02 2015
New Revision: 292975
URL: https://svnweb.freebsd.org/changeset/base/292975

Log:
  MFC r278860:
  r278860 (by jmg):
  
  remove NULL check as M_WAITOK will not return NULL
  
  Reviewed by:	jhb
  Sponsored by:	FreeBSD Foundation

Modified:
  stable/10/sys/dev/pci/pci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/pci/pci.c
==============================================================================
--- stable/10/sys/dev/pci/pci.c	Thu Dec 31 03:32:43 2015	(r292974)
+++ stable/10/sys/dev/pci/pci.c	Thu Dec 31 03:55:02 2015	(r292975)
@@ -615,8 +615,6 @@ pci_read_device(device_t pcib, int d, in
 
 	if (REG(PCIR_DEVVENDOR, 4) != 0xfffffffful) {
 		devlist_entry = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO);
-		if (devlist_entry == NULL)
-			return (NULL);
 
 		cfg = &devlist_entry->cfg;
 



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