From: Kees Cook <keescook@chromium.org>
Date: Sun, 5 Nov 2017 02:36:43 +0000 (-0700)
Subject: drivers/pcmcia: omap1: Fix error in automated timer conversion
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e9c16affe064c84cdccbe96d9896fe149602bceb;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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;
 }