diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-04 11:57:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-04 11:57:25 -0800 |
| commit | dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a (patch) | |
| tree | 10f8363cbf5e428c0cb5614959e37b67a7e0cfa2 /drivers/net/skfp | |
| parent | 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48 (diff) | |
| parent | 9fc3bbb4a752f108cf096d96640f3b548bbbce6c (diff) | |
| download | op-kernel-dev-dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a.zip op-kernel-dev-dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/skfp')
| -rw-r--r-- | drivers/net/skfp/skfddi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 0a66fed..16c6265 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c @@ -412,7 +412,7 @@ static int skfp_driver_init(struct net_device *dev) bp->SharedMemAddr = pci_alloc_consistent(&bp->pdev, bp->SharedMemSize, &bp->SharedMemDMA); - if (!bp->SharedMemSize) { + if (!bp->SharedMemAddr) { printk("could not allocate mem for "); printk("hardware module: %ld byte\n", bp->SharedMemSize); |
