aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-11-05 02:36:43 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-05 10:30:48 (GMT)
commite9c16affe064c84cdccbe96d9896fe149602bceb (patch)
treeff2ed032717ee0bebae3a9cf87fbdc73056d7c0e /drivers/pcmcia
parent991f8f1c6eb634688952fa6a03cc0ce949b6e363 (diff)
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 <fengguang.wu@intel.com> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 8216ceb..c2a17a7 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;
}

Privacy Policy