diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-13 03:50:03 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-13 03:50:03 +1000 |
commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /drivers/net/pci-skeleton.c | |
parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
download | op-kernel-dev-e049d1ca3094f3d1d94617f456a9961202f96e3a.zip op-kernel-dev-e049d1ca3094f3d1d94617f456a9961202f96e3a.tar.gz |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/net/pci-skeleton.c')
-rw-r--r-- | drivers/net/pci-skeleton.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 00ca0fd..6ca4e4f 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c @@ -710,8 +710,8 @@ match: tp->chipset, rtl_chip_info[tp->chipset].name); - i = register_netdev (dev); - if (i) + rc = register_netdev (dev); + if (rc) goto err_out_unmap; DPRINTK ("EXIT, returning 0\n"); |