Merge git://git.infradead.org/users/eparis/audit

[deliverable/linux.git] / drivers / bluetooth / bluecard_cs.c

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index a9a989e5ee88036a186cb7b4d88d73a7aafb563d..dfa5043e68bacc9de66f6ce12c565fb8f410f4b1 100644 (file)
--- 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);
 }