diff options
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 97ba14b759b4..2341b89abc4d 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -354,8 +354,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
354 | goto err_out_free_netdev; | 354 | goto err_out_free_netdev; |
355 | } | 355 | } |
356 | 356 | ||
357 | if (((mem_ptr0 == 0UL) && (mem_len == NETXEN_PCI_128MB_SIZE)) || | 357 | if ((!mem_ptr0 && mem_len == NETXEN_PCI_128MB_SIZE) || |
358 | (mem_ptr1 == 0UL) || (mem_ptr2 == 0UL)) { | 358 | !mem_ptr1 || !mem_ptr2) { |
359 | DPRINTK(ERR, | 359 | DPRINTK(ERR, |
360 | "Cannot remap adapter memory aborting.:" | 360 | "Cannot remap adapter memory aborting.:" |
361 | "0 -> %p, 1 -> %p, 2 -> %p\n", | 361 | "0 -> %p, 1 -> %p, 2 -> %p\n", |
@@ -1337,7 +1337,7 @@ static struct pci_driver netxen_driver = { | |||
1337 | 1337 | ||
1338 | static int __init netxen_init_module(void) | 1338 | static int __init netxen_init_module(void) |
1339 | { | 1339 | { |
1340 | if ((netxen_workq = create_singlethread_workqueue("netxen")) == 0) | 1340 | if ((netxen_workq = create_singlethread_workqueue("netxen")) == NULL) |
1341 | return -ENOMEM; | 1341 | return -ENOMEM; |
1342 | 1342 | ||
1343 | return pci_register_driver(&netxen_driver); | 1343 | return pci_register_driver(&netxen_driver); |