diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:38:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:38:34 -0700 |
| commit | 37aa48368f2508defb1976be62e1ed6ca4dde683 (patch) | |
| tree | 59b606c740ddd10259fbf2248bb50498a319fa6d /drivers/input/misc/soc_button_array.c | |
| parent | 1da4f83c0c43f25baf356c4cc719255877da6b1e (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'drivers/input/misc/soc_button_array.c')
| -rw-r--r-- | drivers/input/misc/soc_button_array.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |