Merge tag 'kbuild-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[platform/kernel/linux-rpi.git] / drivers / pcmcia / omap_cf.c

diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index d3f827d..e613818 100644 (file)
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -296,7 +296,7 @@ static int __exit omap_cf_remove(struct platform_device *pdev)
 
        cf->active = 0;
        pcmcia_unregister_socket(&cf->socket);
-       del_timer_sync(&cf->timer);
+       timer_shutdown_sync(&cf->timer);
        release_mem_region(cf->phys_cf, SZ_8K);
        free_irq(cf->irq, cf);
        kfree(cf);