---

yaml --- r: 190574 b: refs/heads/master c: 8c88e50 h: refs/heads/master v: v3
git-mirror · Apr 28, 2010 · 316cb54 · 316cb54
1 parent 589eeba
commit 316cb54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 404b017d00a9f472bdf725a06892d42f1cba5ed8
+refs/heads/master: 8c88e50bcf7f9f7e1b4987aaac3dfacc3ac6bd24
diff --git a/trunk/drivers/gpu/vga/vga_switcheroo.c b/trunk/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) {