diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-09 01:49:58 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-09 02:14:15 +0200 |
| commit | d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 (patch) | |
| tree | e2b4bb46fa00f0ad20447e40dba6fb21a4ae0815 /drivers/net/ac3200.c | |
| parent | autofs/autofs4: Move compat_ioctl handling into fs (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (diff) | |
| download | linux-d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1.tar.xz linux-d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1.zip | |
Merge commit 'linus/master' into bkl/core
Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
Diffstat (limited to 'drivers/net/ac3200.c')
| -rw-r--r-- | drivers/net/ac3200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c index b9115a776fdd..5181e9322119 100644 --- a/drivers/net/ac3200.c +++ b/drivers/net/ac3200.c @@ -211,7 +211,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev) retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev); if (retval) { printk (" nothing! Unable to get IRQ %d.\n", dev->irq); - goto out1; + goto out; } printk(" IRQ %d, %s port\n", dev->irq, port_name[dev->if_port]); |