[tip:timers/core] drivers/pcmcia: omap1: Fix error in automated timer conversion

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  439dc05fbfdbcf01995f4941ac597b8668e00ec3
Gitweb:     https://git.kernel.org/tip/439dc05fbfdbcf01995f4941ac597b8668e00ec3
Author:     Kees Cook <keescook@xxxxxxxxxxxx>
AuthorDate: Sat, 4 Nov 2017 19:32:31 -0700
Committer:  Kees Cook <keescook@xxxxxxxxxxxx>
CommitDate: Mon, 6 Nov 2017 12:49:15 -0800

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@xxxxxxxxxxxx>
---
 drivers/pcmcia/omap_cf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
 }
 
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux