From ec31b5aec30f7f2eba6eb430923b0fbc898b91ae Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Fri, 26 Dec 2008 00:04:26 -0800 Subject: [PATCH] --- yaml --- r: 122911 b: refs/heads/master c: f8057b7fefea1daca6928cbb95751d01fc934a41 h: refs/heads/master i: 122909: dc8285f639666c3e3e5171848a89be6f12c5cd46 122907: e65a8e4a32e1ce1a2a62ae30bc094230cbe97e50 122903: 63fc845edf21da75de9551ccabfbe7ad90812ace 122895: 499607026c235eca4b92e37ca5318c59dd91dda3 122879: b3224e7a67c3a427e66fac19d63da08dfe2ae7e8 v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_hw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3d851e4a510..f884fb876d61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e855aac805dd9c68b6fabe395cbc8e05f0eda6e4 +refs/heads/master: f8057b7fefea1daca6928cbb95751d01fc934a41 diff --git a/trunk/drivers/net/netxen/netxen_nic_hw.c b/trunk/drivers/net/netxen/netxen_nic_hw.c index 86379fdd8b0e..aa6e603bfcbf 100644 --- a/trunk/drivers/net/netxen/netxen_nic_hw.c +++ b/trunk/drivers/net/netxen/netxen_nic_hw.c @@ -1459,7 +1459,7 @@ static int netxen_nic_pci_mem_read_direct(struct netxen_adapter *adapter, mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE * 2); else mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE); - if (mem_ptr == 0UL) { + if (mem_ptr == NULL) { *(uint8_t *)data = 0; return -1; } @@ -1533,7 +1533,7 @@ netxen_nic_pci_mem_write_direct(struct netxen_adapter *adapter, u64 off, mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE*2); else mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE); - if (mem_ptr == 0UL) + if (mem_ptr == NULL) return -1; addr = mem_ptr; addr += start & (PAGE_SIZE - 1);