diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:31:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:31:34 -0800 |
| commit | d43a338e395371733a80ec473b40baac5f74d768 (patch) | |
| tree | d4c01b62865bed1af2463d7a4eb4cb25ca46c66e /drivers/input/keyboard/hilkbd.c | |
| parent | cb4aaf46c0283dd79ab2e8b8b165c0bf13ab6194 (diff) | |
| parent | 62b529a7b9c11880a8820494a25db0e2ecdf3bed (diff) | |
| download | linux-d43a338e395371733a80ec473b40baac5f74d768.tar.bz2 | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
Input: remove obsolete setup parameters from input drivers
Input: HIL - fix improper call to release_region()
Input: hid-lgff - treat devices as joysticks unless told otherwise
Input: HID - add support for Logitech Formula Force EX
Input: gpio-keys - switch to common GPIO API
Input: do not lock device when showing name, phys and uniq
Input: i8042 - let serio bus suspend ports
Input: psmouse - properly reset mouse on shutdown/suspend
Diffstat (limited to 'drivers/input/keyboard/hilkbd.c')
| -rw-r--r-- | drivers/input/keyboard/hilkbd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c index 255a6ec75a48..4de4dc297d50 100644 --- a/drivers/input/keyboard/hilkbd.c +++ b/drivers/input/keyboard/hilkbd.c @@ -294,8 +294,10 @@ err3: disable_irq(HIL_IRQ); free_irq(HIL_IRQ, hil_dev.dev_id); err2: +#if defined(CONFIG_HP300) release_region(HILBASE + HIL_DATA, 2); err1: +#endif input_free_device(hil_dev.dev); hil_dev.dev = NULL; return err; |