diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 16:08:32 +0200 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 16:08:32 +0200 |
| commit | 3f04e3d3eb77ac9df70619b9c87da71b0eeddc36 (patch) | |
| tree | cf1cbadc390888d1910a81ffc40161f783363075 /drivers/input/misc | |
| parent | 8cffcb0ca33381e07cee4ebe1301d0794054fc97 (diff) | |
| parent | 2779ac167b1a1bf8153dca9f3a141c6148c6b89f (diff) | |
Merge remote-tracking branch 'tip/timers/core/timers/core' into clockevents/3.16
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/da9055_onkey.c | 1 | ||||
| -rw-r--r-- | drivers/input/misc/soc_button_array.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/da9055_onkey.c b/drivers/input/misc/da9055_onkey.c index 4b11ede34950..4765799fef74 100644 --- a/drivers/input/misc/da9055_onkey.c +++ b/drivers/input/misc/da9055_onkey.c @@ -109,7 +109,6 @@ static int da9055_onkey_probe(struct platform_device *pdev) INIT_DELAYED_WORK(&onkey->work, da9055_onkey_work); - irq = regmap_irq_get_virq(da9055->irq_data, irq); err = request_threaded_irq(irq, NULL, da9055_onkey_irq, IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "ONKEY", onkey); diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index 08ead2aaede5..20c80f543d5e 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -169,6 +169,7 @@ static int soc_button_pnp_probe(struct pnp_dev *pdev, soc_button_remove(pdev); return error; } + continue; } priv->children[i] = pd; |