Module Name: src
Committed By: he
Date: Mon Sep 1 19:46:55 UTC 2014
Modified Files:
src/sys/dev/if_ndis: if_ndis_pci.c
Log Message:
Remove redundant test for rl == NULL, that's already established
right after its allocation, and rl isn't re-assigned later.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/if_ndis/if_ndis_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/if_ndis/if_ndis_pci.c
diff -u src/sys/dev/if_ndis/if_ndis_pci.c:1.19 src/sys/dev/if_ndis/if_ndis_pci.c:1.20
--- src/sys/dev/if_ndis/if_ndis_pci.c:1.19 Sat Oct 27 17:18:23 2012
+++ src/sys/dev/if_ndis/if_ndis_pci.c Mon Sep 1 19:46:55 2014
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.19 2012/10/27 17:18:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.20 2014/09/01 19:46:55 he Exp $");
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24:36 wpaul Exp $");
#endif
@@ -358,11 +358,6 @@ void ndis_attach_pci(device_t parent, de
printf("pci interrupt: %s\n", pci_intr_string(pa->pa_pc, ih));
- if(rl == NULL) {
- sc->error = ENOMEM;
- return;
- }
-
/* save resource list in the softc */
sc->ndis_rl = rl;
sc->ndis_rescnt = rl->cprl_count;
