HIL: fix improper call of release_region
PATCH 1/1 HIL: fix improper call of release_region
Thist patch prevents from improper call of release_region if the code has been compiled without CONFIG_HP300 support.
Signed-off-by Cyrill V. Gorcunov <[email protected]>
---
drivers/input/keyboard/hilkbd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/input/keyboard/hilkbd.c +2 -0
@@ -294,7 +294,9 @@ err3:disable_irq (HIL_IRQ );free_irq (HIL_IRQ , hil_dev.dev_id); err2: +#if defined(CONFIG_HP300 )release_region (HILBASE +HIL_DATA ,2 ); +#endif err1:input_free_device (hil_dev.dev); hil_dev.dev =NULL ;
Hi Cyrill,
please include the "err1" label as well inside the #if / #endif clause.
err1 is used only when CONFIG_HP300 is defined and in the parisc-case you currently get an unused label warning...
Helge
Quoted 25 lines · Cyrill V. Gorcunov
Thist patch prevents from improper call of
release_regionif the code has been compiled withoutCONFIG_HP300support.Signed-off-by Cyrill V. Gorcunov <[email protected]>---
drivers/input/keyboard/hilkbd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)drivers/input/keyboard/hilkbd.c +2
-0@@ -294,7 +294,9 @@ err3:disable_irq (HIL_IRQ );free_irq (HIL_IRQ , hil_dev.dev_id); err2: +#if defined(CONFIG_HP300 )release_region (HILBASE +HIL_DATA ,2 ); +#endif err1:input_free_device (hil_dev.dev); hil_dev.dev =NULL ;
On Thu, Feb 15, 2007 at 07:54:33PM +0100, Helge Deller wrote:
| Hi Cyrill, | | please include the "err1" label as well inside the #if / #endif clause. | err1 is used only when CONFIG_HP300 is defined and in the parisc-case you currently get an unused label warning... | | Helge | | On Thursday 15 February 2007, Cyrill V. Gorcunov wrote: | > Thist patch prevents from improper call of release_region | > if the code has been compiled without CONFIG_HP300 support. | > | > Signed-off-by: Cyrill V. Gorcunov <[email protected]> | > | > --- | > | > 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 255a6ec..c3c0da3 100644 | > --- a/drivers/input/keyboard/hilkbd.c | > +++ b/drivers/input/keyboard/hilkbd.c | > @@ -294,7 +294,9 @@ err3: | > disable_irq(HIL_IRQ); | > free_irq(HIL_IRQ, hil_dev.dev_id); | > err2: | > +#if defined(CONFIG_HP300) | > release_region(HILBASE + HIL_DATA, 2); | > +#endif | > err1: | > input_free_device(hil_dev.dev); | > hil_dev.dev = NULL; | > | |
Indeed. Give me a minute. (Damn, how could I get a such mistake ;)
Signature · 1 line
Cyrill