summary refs log tree commit diff
path: root/drivers/bluetooth/bluecard_cs.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-03-23 15:09:31 +0000
committerMarcel Holtmann <marcel@holtmann.org>2014-03-23 10:30:22 -0700
commitd8ff9cdf68fd119d491f3de90e1a612afc2f3b2b (patch)
treeca4cebe5a84e654bebdb11cdfb447369b965e2d4 /drivers/bluetooth/bluecard_cs.c
parent533553f8738184bcf957d97fed9eb4d5f023e4a7 (diff)
downloadlinux-d8ff9cdf68fd119d491f3de90e1a612afc2f3b2b.tar.gz
Bluetooth: bluecard: Use del_timer_sync() in teardown path
Make sure no timer callback is running before releasing the
datastructure which contains it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/bluecard_cs.c')
-rw-r--r--drivers/bluetooth/bluecard_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index a9a989e5ee88..dfa5043e68ba 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -901,7 +901,7 @@ static void bluecard_release(struct pcmcia_device *link)
 
 	bluecard_close(info);
 
-	del_timer(&(info->timer));
+	del_timer_sync(&(info->timer));
 
 	pcmcia_disable_device(link);
 }