summaryrefslogtreecommitdiff
path: root/drivers/extcon/extcon-arizona.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-15 22:04:50 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-15 22:04:50 (GMT)
commit115b1cc2ef0f43ecb42bdbf55f06e9d2231d5a7e (patch)
tree776fe64cb84da07ad52b1cad4052fc715433fe29 /drivers/extcon/extcon-arizona.c
parent2b8318881ddbcb67c5e8d2178b42284749442222 (diff)
parent962b686c450493adb8596e813bdfd0e1613482e6 (diff)
downloadlinux-fsl-qoriq-115b1cc2ef0f43ecb42bdbf55f06e9d2231d5a7e.tar.xz
Merge tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull EXTCON patches from Greg Kroah-Hartman: "Here are some drivers/extcon/ patches that I forgot to have you pull in the larger char/misc patchset from yesterday, for the 3.8-rc1 kernel. Nothing major here, just some driver updates, and cleanups, all of which have been in linux-next for a while now. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: extcon: kernel_doc style fix extcon: max77693: Fix uninitialised variable warning extcon: max77693: Use devm_kzalloc extcon: max8997: Use devm_kzalloc extcon: max8997: Fix a typo extcon: max8997: Fix checkpatch error extcon: max77693: Fix coding style extcon: max77693: Fix incorrect error check and return value extcon: max8997: Fix incorrect error check and return value extcon: Fix return value in extcon-class.c extcon: Add missing header file to extcon.h extcon: arizona: unlock mutex on error path in arizona_micdet()
Diffstat (limited to 'drivers/extcon/extcon-arizona.c')
-rw-r--r--drivers/extcon/extcon-arizona.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index f10f05d..414aed5 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -166,6 +166,7 @@ static irqreturn_t arizona_micdet(int irq, void *data)
ret = regmap_read(arizona->regmap, ARIZONA_MIC_DETECT_3, &val);
if (ret != 0) {
dev_err(arizona->dev, "Failed to read MICDET: %d\n", ret);
+ mutex_unlock(&info->lock);
return IRQ_NONE;
}