diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-10-11 09:56:35 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-11-16 16:46:52 +0000 |
| commit | 5a7b9047f5512e10e6ef89cd36e5b572bf13f60e (patch) | |
| tree | 9844f78a7eeacb9e720b6aff75d15af6b60474df /drivers/gpio | |
| parent | bdf24c170f3ac62c564392ca60a682baa0e7ef58 (diff) | |
| download | kernel_samsung_smdk4412-5a7b9047f5512e10e6ef89cd36e5b572bf13f60e.zip kernel_samsung_smdk4412-5a7b9047f5512e10e6ef89cd36e5b572bf13f60e.tar.gz kernel_samsung_smdk4412-5a7b9047f5512e10e6ef89cd36e5b572bf13f60e.tar.bz2 | |
gpio-timberdale: fix a potential wrapping issue
commit d79550a7bc35c16476ebdc27c78378d8093390ec upstream.
->last_ier is an unsigned long but the high bits can't be used int the
original code because the shift wraps.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-timberdale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c index c593bd4..edff410 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); } |