summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-11-04 19:32:31 -0700
committerKees Cook <keescook@chromium.org>2017-11-06 12:49:15 -0800
commit439dc05fbfdbcf01995f4941ac597b8668e00ec3 (patch)
treecb2222772a28fb06b82f69f7144e3a9949c7e919 /drivers/pcmcia
parent14c8276d3bdfbadb033e3aaca6ac39781f20e44d (diff)
downloadblackbird-op-linux-439dc05fbfdbcf01995f4941ac597b8668e00ec3.tar.gz
blackbird-op-linux-439dc05fbfdbcf01995f4941ac597b8668e00ec3.zip
drivers/pcmcia: omap1: Fix error in automated timer conversion
One part of automated timer conversion tools did not take into account void * variables when searching out prior direct timer callback usage, which resulted in an attempt to dereference the timer field without a proper type. Reported-by: kbuild test robot Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/omap_cf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 8216ceb51b18..c2a17a79f0b2 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -102,7 +102,9 @@ static void omap_cf_timer(struct timer_list *t)
*/
static irqreturn_t omap_cf_irq(int irq, void *_cf)
{
- omap_cf_timer(&_cf->timer);
+ struct omap_cf_socket *cf = (struct omap_cf_socket *)_cf;
+
+ omap_cf_timer(&cf->timer);
return IRQ_HANDLED;
}
OpenPOWER on IntegriCloud