diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 11:05:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 11:05:20 -0700 |
| commit | 89d8ab6993e1d9f3c482ee8c862c03c528f696aa (patch) | |
| tree | d9adfe3c3d3e640bd5d7cacabef6c18f739fce22 /drivers/net/depca.c | |
| parent | Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 (diff) | |
| parent | drivers/net/hamradio/baycom_ser_fdx build fix (diff) | |
| download | linux-dev-89d8ab6993e1d9f3c482ee8c862c03c528f696aa.tar.xz linux-dev-89d8ab6993e1d9f3c482ee8c862c03c528f696aa.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
drivers/net/hamradio/baycom_ser_fdx build fix
usb-net/pegasus: fix pegasus carrier detection
sis900: Allocate rx replacement buffer before rx operation
[netdrvr] depca: handle platform_device_add() failure
Diffstat (limited to 'drivers/net/depca.c')
| -rw-r--r-- | drivers/net/depca.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index 5113eef755b9..f3807aaf10aa 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c @@ -1491,8 +1491,9 @@ static void __init depca_platform_probe (void) depca_io_ports[i].device = pldev; if (platform_device_add(pldev)) { - platform_device_put(pldev); depca_io_ports[i].device = NULL; + pldev->dev.platform_data = NULL; + platform_device_put(pldev); continue; } |