Skip to content

Commit

Permalink
mfd: Make TPS65910 usable without interrupts
Browse files Browse the repository at this point in the history
TPS65910 can be used without interrupts.
Hence let probe succeed in case interrupt can't be
configured and let Kernel only to complain about it

Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Afzal Mohammed authored and Samuel Ortiz committed Jan 8, 2012
1 parent 26cc3ab commit 1e351a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
3 changes: 2 additions & 1 deletion drivers/mfd/tps65910-irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ int tps65910_irq_init(struct tps65910 *tps65910, int irq,

int tps65910_irq_exit(struct tps65910 *tps65910)
{
free_irq(tps65910->chip_irq, tps65910);
if (tps65910->chip_irq)
free_irq(tps65910->chip_irq, tps65910);
return 0;
}
7 changes: 2 additions & 5 deletions drivers/mfd/tps65910.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,12 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,

tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);

ret = tps65910_irq_init(tps65910, init_data->irq, init_data);
if (ret < 0)
goto err;
tps65910_irq_init(tps65910, init_data->irq, init_data);

kfree(init_data);
return ret;

err:
mfd_remove_devices(tps65910->dev);
kfree(tps65910);
kfree(init_data);
return ret;
Expand All @@ -190,8 +187,8 @@ static int tps65910_i2c_remove(struct i2c_client *i2c)
{
struct tps65910 *tps65910 = i2c_get_clientdata(i2c);

mfd_remove_devices(tps65910->dev);
tps65910_irq_exit(tps65910);
mfd_remove_devices(tps65910->dev);
kfree(tps65910);

return 0;
Expand Down

0 comments on commit 1e351a9

Please sign in to comment.