From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 27 Apr 2010 21:11:03 +0000 (-0700)
Subject: gpu: vga_switcheroo, fix lock imbalance
X-Git-Tag: v2.6.34-rc7~24^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8c88e50bcf7f9f7e1b4987aaac3dfacc3ac6bd24;p=~shefty%2Frdma-dev.git

gpu: vga_switcheroo, fix lock imbalance

Stanse found that one error path in vga_switcheroo_debugfs_write omits to
unlock vgasr_mutex.  Fix that.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index d6d1149d525..c8768f38511 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -276,8 +276,10 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 
 	mutex_lock(&vgasr_mutex);
 
-	if (!vgasr_priv.active)
-		return -EINVAL;
+	if (!vgasr_priv.active) {
+		cnt = -EINVAL;
+		goto out;
+	}
 
 	/* pwr off the device not in use */
 	if (strncmp(usercmd, "OFF", 3) == 0) {