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 <roman.tereshonkov@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
powerbutton_dev->name = "triton2-pwrbutton";
err = input_register_device(powerbutton_dev);
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) {
err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_IMR1);
if (err) {
}
err = twl4030_i2c_write_u8(TWL4030_MODULE_INT,
}
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"
if (err) {
printk(KERN_WARNING "I2C error %d while writing TWL4030"
- input_free_device(powerbutton_dev);
+ input_unregister_device(powerbutton_dev);
free_irq_and_out:
free_irq(TWL4030_PWRIRQ_PWRBTN, NULL);
out:
free_irq_and_out:
free_irq(TWL4030_PWRIRQ_PWRBTN, NULL);
out: