aboutsummaryrefslogtreecommitdiff
path: root/drivers/bcma/main.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-05-31 12:02:46 +0800
committerAlex Shi <alex.shi@linaro.org>2017-05-31 12:02:46 +0800
commitdc06d1ba220ca16ebbca598bb45242ec5e818cb2 (patch)
treeef66bd14901ec3a07cf65842a3b63884a64be529 /drivers/bcma/main.c
parent018ed21cf3b7cb618c63294793d63b23ce4afe24 (diff)
parenta898540914d4136f29bc738ce593c1c501006f23 (diff)
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-17.06-androidlsk-v4.1-17.05-androidlinux-linaro-lsk-v4.1-android
Diffstat (limited to 'drivers/bcma/main.c')
-rw-r--r--drivers/bcma/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 9635f1033ce5..fd077f2d7605 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -609,8 +609,11 @@ static int bcma_device_probe(struct device *dev)
drv);
int err = 0;
+ get_device(dev);
if (adrv->probe)
err = adrv->probe(core);
+ if (err)
+ put_device(dev);
return err;
}
@@ -623,6 +626,7 @@ static int bcma_device_remove(struct device *dev)
if (adrv->remove)
adrv->remove(core);
+ put_device(dev);
return 0;
}