summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-timberdale.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-10-11 10:56:35 +0400
committerLinus Walleij <linus.walleij@linaro.org>2012-10-15 22:50:03 +0400
commitd79550a7bc35c16476ebdc27c78378d8093390ec (patch)
treeaadfd22e7968442d04fa651eab2c64d37b4c9d87 /drivers/gpio/gpio-timberdale.c
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
downloadlinux-d79550a7bc35c16476ebdc27c78378d8093390ec.tar.xz
gpio-timberdale: fix a potential wrapping issue
->last_ier is an unsigned long but the high bits can't be used int the original code because the shift wraps. Cc: stable@kernel.org Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-timberdale.c')
-rw-r--r--drivers/gpio/gpio-timberdale.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index 031c6adf5b65..1a3e2b9b4772 100644
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -116,7 +116,7 @@ static void timbgpio_irq_disable(struct irq_data *d)
unsigned long flags;
spin_lock_irqsave(&tgpio->lock, flags);
- tgpio->last_ier &= ~(1 << offset);
+ tgpio->last_ier &= ~(1UL << offset);
iowrite32(tgpio->last_ier, tgpio->membase + TGPIO_IER);
spin_unlock_irqrestore(&tgpio->lock, flags);
}
@@ -128,7 +128,7 @@ static void timbgpio_irq_enable(struct irq_data *d)
unsigned long flags;
spin_lock_irqsave(&tgpio->lock, flags);
- tgpio->last_ier |= 1 << offset;
+ tgpio->last_ier |= 1UL << offset;
iowrite32(tgpio->last_ier, tgpio->membase + TGPIO_IER);
spin_unlock_irqrestore(&tgpio->lock, flags);
}