viafb: Do not remove gpiochip under spinlock

gpiochip_remove() is not meant to be called with interrupts disabled, and
there is no need for the lock here in any case.

Reported-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2010-04-30 09:45:51 -06:00
Родитель 2b78a963c8
Коммит 27fe971d08
1 изменённых файлов: 2 добавлений и 3 удалений

Просмотреть файл

@ -246,7 +246,6 @@ static int viafb_gpio_remove(struct platform_device *platdev)
unsigned long flags; unsigned long flags;
int ret = 0, i; int ret = 0, i;
spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
/* /*
* Get unregistered. * Get unregistered.
*/ */
@ -254,16 +253,16 @@ static int viafb_gpio_remove(struct platform_device *platdev)
ret = gpiochip_remove(&gpio_config.gpio_chip); ret = gpiochip_remove(&gpio_config.gpio_chip);
if (ret) { /* Somebody still using it? */ if (ret) { /* Somebody still using it? */
printk(KERN_ERR "Viafb: GPIO remove failed\n"); printk(KERN_ERR "Viafb: GPIO remove failed\n");
goto out; return ret;
} }
} }
/* /*
* Disable the ports. * Disable the ports.
*/ */
spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2) for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
viafb_gpio_disable(gpio_config.active_gpios[i]); viafb_gpio_disable(gpio_config.active_gpios[i]);
gpio_config.gpio_chip.ngpio = 0; gpio_config.gpio_chip.ngpio = 0;
out:
spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags); spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
return ret; return ret;
} }