Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / rtc / rtc-rx8025.c

diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index 1146e3522d3cdc82b512fc751e4ac6adf03c0440..af32a62e12a82365cf2e796f4d66d961505f42aa 100644 (file)
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -650,7 +650,7 @@ static int __devexit rx8025_remove(struct i2c_client *client)
                mutex_unlock(lock);
 
                free_irq(client->irq, client);
-               flush_scheduled_work();
+               cancel_work_sync(&rx8025->work);
        }
 
        rx8025_sysfs_unregister(&client->dev);