diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:42:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:42:20 -0700 |
| commit | 53971a86d2db89f32859dc26bd6594b5bc665d5b (patch) | |
| tree | 350ee9f3d53494036308cd123054dac3ba86ff91 /drivers/input/misc | |
| parent | d5dbd3f7d82223b59dc2200c0e9f4f95665a21a4 (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
Merge 3.15-rc3 into usb-next
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; |