diff options
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/drivers/mach-a3/gpio.c b/arch/cris/arch-v32/drivers/mach-a3/gpio.c index 7a87bc0ae2e8..97357cfd17bb 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/gpio.c +++ b/arch/cris/arch-v32/drivers/mach-a3/gpio.c | |||
| @@ -681,7 +681,7 @@ static int virtual_gpio_ioctl(struct file *file, unsigned int cmd, | |||
| 681 | shadow |= ~readl(dir_oe[priv->minor]) | | 681 | shadow |= ~readl(dir_oe[priv->minor]) | |
| 682 | (arg & changeable_bits[priv->minor]); | 682 | (arg & changeable_bits[priv->minor]); |
| 683 | i2c_write(VIRT_I2C_ADDR, (void *)&shadow, sizeof(shadow)); | 683 | i2c_write(VIRT_I2C_ADDR, (void *)&shadow, sizeof(shadow)); |
| 684 | spin_lock_irqrestore(&gpio_lock, flags); | 684 | spin_unlock_irqrestore(&gpio_lock, flags); |
| 685 | break; | 685 | break; |
| 686 | case IO_CLRBITS: | 686 | case IO_CLRBITS: |
| 687 | spin_lock_irqsave(&gpio_lock, flags); | 687 | spin_lock_irqsave(&gpio_lock, flags); |
| @@ -690,7 +690,7 @@ static int virtual_gpio_ioctl(struct file *file, unsigned int cmd, | |||
| 690 | shadow |= ~readl(dir_oe[priv->minor]) & | 690 | shadow |= ~readl(dir_oe[priv->minor]) & |
| 691 | ~(arg & changeable_bits[priv->minor]); | 691 | ~(arg & changeable_bits[priv->minor]); |
| 692 | i2c_write(VIRT_I2C_ADDR, (void *)&shadow, sizeof(shadow)); | 692 | i2c_write(VIRT_I2C_ADDR, (void *)&shadow, sizeof(shadow)); |
| 693 | spin_lock_irqrestore(&gpio_lock, flags); | 693 | spin_unlock_irqrestore(&gpio_lock, flags); |
| 694 | break; | 694 | break; |
| 695 | case IO_HIGHALARM: | 695 | case IO_HIGHALARM: |
| 696 | /* Set alarm when bits with 1 in arg go high. */ | 696 | /* Set alarm when bits with 1 in arg go high. */ |