summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2009-08-14 15:49:43 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-15 18:50:42 -0700
commit64c6460875957502541a4ba30835ac625a0bee79 (patch)
tree2e8f6b993b05c856a071e66f66064fbf7f64d300
parent8cdb045632e5ee22854538619ac6f150eb0a4894 (diff)
downloadop-kernel-dev-64c6460875957502541a4ba30835ac625a0bee79.zip
op-kernel-dev-64c6460875957502541a4ba30835ac625a0bee79.tar.gz
cnic: Fix symbol_put_addr() panic on ia64.
When the cnic driver tries to grab a symbol from bnx2 when bnx2 is running init code, symbol_get() will succeed but symbol_put_addr() will hit BUG() a moment later. module_text_address() fails because bnx2 is still in init code. This is fixed by using symbol_put() instead which does the exact opposite of symbol_get(). Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/cnic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 4869d77..ecde186 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -2543,7 +2543,7 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev)
probe = symbol_get(bnx2_cnic_probe);
if (probe) {
ethdev = (*probe)(dev);
- symbol_put_addr(probe);
+ symbol_put(bnx2_cnic_probe);
}
if (!ethdev)
return NULL;
OpenPOWER on IntegriCloud