---

yaml --- r: 193576 b: refs/heads/master c: 27fe971 h: refs/heads/master v: v3
git-mirror · May 7, 2010 · 847f2db · 847f2db
1 parent 8991de6
commit 847f2db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b78a963c800252a0016785813cc5140c006145c
+refs/heads/master: 27fe971d08b43f649358745a55f3c48ac6f413f8
diff --git a/trunk/drivers/video/via/via-gpio.c b/trunk/drivers/video/via/via-gpio.c
@@ -246,24 +246,23 @@ static int viafb_gpio_remove(struct platform_device *platdev)
 	unsigned long flags;
 	int ret = 0, i;
 
-	spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
 	/*
 	 * Get unregistered.
 	 */
 	if (gpio_config.gpio_chip.ngpio > 0) {
 		ret = gpiochip_remove(&gpio_config.gpio_chip);
 		if (ret) { /* Somebody still using it? */
 			printk(KERN_ERR "Viafb: GPIO remove failed\n");
-			goto out;
+			return ret;
 		}
 	}
 	/*
 	 * Disable the ports.
 	 */
+	spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
 	for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
 		viafb_gpio_disable(gpio_config.active_gpios[i]);
 	gpio_config.gpio_chip.ngpio = 0;
-out:
 	spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
 	return ret;
 }