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

[mv-sheeva.git] / drivers / mfd / menelaus.c

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 4ba85bbdb4c12b60bdb6944223d4a467626f7c3e..9cee8e7f0bcb1297116667de77ab1d3f49ce1213 100644 (file)
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1259,7 +1259,7 @@ static int menelaus_probe(struct i2c_client *client,
        return 0;
 fail2:
        free_irq(client->irq, menelaus);
-       flush_scheduled_work();
+       flush_work_sync(&menelaus->work);
 fail1:
        kfree(menelaus);
        return err;
@@ -1270,6 +1270,7 @@ static int __exit menelaus_remove(struct i2c_client *client)
        struct menelaus_chip    *menelaus = i2c_get_clientdata(client);
 
        free_irq(client->irq, menelaus);
+       flush_work_sync(&menelaus->work);
        kfree(menelaus);
        the_menelaus = NULL;
        return 0;