summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorLejun Zhu <lejun.zhu@linux.intel.com>2014-04-22 22:47:13 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-22 22:56:36 -0700
commit7740fc52105c9e6d2beac389a9ae0ce7138cf5ab (patch)
tree33051de032a324d46e46fdff0b9c776ae137f64a /drivers/input
parent46a2986ebbe18757c2d8c352f8fb6e0f4f0754e3 (diff)
downloadlinux-7740fc52105c9e6d2beac389a9ae0ce7138cf5ab.tar.gz
linux-7740fc52105c9e6d2beac389a9ae0ce7138cf5ab.tar.xz
Input: soc_button_array - fix a crash during rmmod
When the system has zero or one button available, trying to rmmod soc_button_array will cause crash. Fix this by properly handling -ENODEV in probe(). Signed-off-by: Lejun Zhu <lejun.zhu@linux.intel.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/soc_button_array.c1
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;