summaryrefslogtreecommitdiffstats
path: root/drivers/vme
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-17 01:57:34 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-27 12:43:35 +0200
commitdb08948b97180a3c9f49ce91caf1fb643a8110be (patch)
treeae93fca69de0b0168dc6043bbd6f312d1a9f717b /drivers/vme
parent58ccaae30322b13c587596adb39408fca2a5ef7f (diff)
downloadlinux-stable-db08948b97180a3c9f49ce91caf1fb643a8110be.tar.gz
linux-stable-db08948b97180a3c9f49ce91caf1fb643a8110be.tar.bz2
linux-stable-db08948b97180a3c9f49ce91caf1fb643a8110be.zip
vme: fake: remove unexpected unlock in fake_master_set()
image->lock is unlocked in some error handling path without take the lock, so remove those unexpected unlock. Fixes: 658bcdae9c67 ("vme: Adding Fake VME driver") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/vme')
-rw-r--r--drivers/vme/bridges/vme_fake.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/vme/bridges/vme_fake.c b/drivers/vme/bridges/vme_fake.c
index 29ac74f7889d..30b3acc93833 100644
--- a/drivers/vme/bridges/vme_fake.c
+++ b/drivers/vme/bridges/vme_fake.c
@@ -273,7 +273,6 @@ static int fake_master_set(struct vme_master_resource *image, int enabled,
}
if (size & 0xFFFF) {
- spin_unlock(&image->lock);
pr_err("Invalid size alignment\n");
retval = -EINVAL;
goto err_window;
@@ -292,7 +291,6 @@ static int fake_master_set(struct vme_master_resource *image, int enabled,
case VME_D32:
break;
default:
- spin_unlock(&image->lock);
pr_err("Invalid data width\n");
retval = -EINVAL;
goto err_dwidth;
@@ -311,7 +309,6 @@ static int fake_master_set(struct vme_master_resource *image, int enabled,
case VME_USER4:
break;
default:
- spin_unlock(&image->lock);
pr_err("Invalid address space\n");
retval = -EINVAL;
goto err_aspace;