From: Roman Tereshonkov Date: Tue, 17 Jun 2008 13:48:06 +0000 (+0300) Subject: The fix prevents kernel crash caused by twl4030 power button malfunction. X-Git-Tag: v2.6.26-omap1~116 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6f4f59c6c05c5ea365e8dc216f3812aa142a2b55;p=linux-2.6-omap-h63xx.git The fix prevents kernel crash caused by twl4030 power button malfunction. If i2c connection is broken the twl4030 power button driver is unregistered. The function input_free_device has to be called only when input_register_device failed. Otherwise input_unregister_device is used. Signed-off-by: Roman Tereshonkov Signed-off-by: Tony Lindgren --- diff --git a/drivers/i2c/chips/twl4030-pwrbutton.c b/drivers/i2c/chips/twl4030-pwrbutton.c index cbc31aa3378..a8258df22fc 100644 --- a/drivers/i2c/chips/twl4030-pwrbutton.c +++ b/drivers/i2c/chips/twl4030-pwrbutton.c @@ -95,8 +95,10 @@ static int __init twl4030_pwrbutton_init(void) powerbutton_dev->name = "triton2-pwrbutton"; err = input_register_device(powerbutton_dev); - if (err) - goto free_input_dev; + if (err) { + input_free_device(powerbutton_dev); + goto free_irq_and_out; + } err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_IMR1); if (err) { @@ -122,7 +124,7 @@ static int __init twl4030_pwrbutton_init(void) } err = twl4030_i2c_write_u8(TWL4030_MODULE_INT, - value | PWR_PWRON_BOTH , PWR_EDR1); + value | PWR_PWRON_BOTH, PWR_EDR1); if (err) { printk(KERN_WARNING "I2C error %d while writing TWL4030" @@ -136,7 +138,7 @@ static int __init twl4030_pwrbutton_init(void) free_input_dev: - input_free_device(powerbutton_dev); + input_unregister_device(powerbutton_dev); free_irq_and_out: free_irq(TWL4030_PWRIRQ_PWRBTN, NULL); out: