aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorCyrill V. Gorcunov <gorcunov@gmail.com>2007-02-18 01:44:02 -0500
committerDmitry Torokhov <dtor@insightbb.com>2007-02-18 01:44:02 -0500
commit2a575f11fb8e13d6bbdefaa591e9406200674402 (patch)
treed10310b8a72bad2e22e4bfd3d9fa6d9411579ab6 /drivers/input
parent00a8691ca689c134eaf5b73d7251df1d6f0318be (diff)
Input: HIL - fix improper call to release_region()
Do not call release_region() if the code has been compiled without CONFIG_HP300 support. Signed-off-by: Cyrill V. Gorcunov <gorcunov@gmail.com> Acked-by: Helge Deller <deller@gmx.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/hilkbd.c2
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:
294 disable_irq(HIL_IRQ); 294 disable_irq(HIL_IRQ);
295 free_irq(HIL_IRQ, hil_dev.dev_id); 295 free_irq(HIL_IRQ, hil_dev.dev_id);
296err2: 296err2:
297#if defined(CONFIG_HP300)
297 release_region(HILBASE + HIL_DATA, 2); 298 release_region(HILBASE + HIL_DATA, 2);
298err1: 299err1:
300#endif
299 input_free_device(hil_dev.dev); 301 input_free_device(hil_dev.dev);
300 hil_dev.dev = NULL; 302 hil_dev.dev = NULL;
301 return err; 303 return err;