diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:29:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:29:58 -0700 |
| commit | 81f8320f624a785d77443ace83391d0fdee695f6 (patch) | |
| tree | ef061e677c0643b6ab565580caaf72a3de90ed72 /drivers/input/keyboard | |
| parent | 6d435365dd49ac5f7fe6f0e757e942875b1d1550 (diff) | |
| parent | 46249ea60fbb61a72ee6929b831b1f3e6865f024 (diff) | |
| download | linux-81f8320f624a785d77443ace83391d0fdee695f6.tar.gz linux-81f8320f624a785d77443ace83391d0fdee695f6.tar.bz2 linux-81f8320f624a785d77443ace83391d0fdee695f6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: appletouch - apply idle reset logic to all touchpads
Input: usbtouchscreen - add support for GoTop tablet devices
Input: bf54x-keys - return real error when request_irq() fails
Input: i8042 - export i8042_command()
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/bf54x-keys.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index a67b29b089ef..e5f4da928340 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c @@ -256,7 +256,6 @@ static int __devinit bfin_kpad_probe(struct platform_device *pdev) printk(KERN_ERR DRV_NAME ": unable to claim irq %d; error %d\n", bf54x_kpad->irq, error); - error = -EBUSY; goto out2; } |