From 142d58a6419b87d691e06f248a09998d70b303ca Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Wed, 22 Aug 2012 15:32:45 +0800 Subject: [PATCH] --- yaml --- r: 333070 b: refs/heads/master c: a39b9854c79cc9ac7b7b6fed58cf07da23f1f41e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-lp5523.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5600e3501917..e962fde4dc82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94b43b677104e50b9f8dd75aacb3c69e16089a68 +refs/heads/master: a39b9854c79cc9ac7b7b6fed58cf07da23f1f41e diff --git a/trunk/drivers/leds/leds-lp5523.c b/trunk/drivers/leds/leds-lp5523.c index 9fd9a92ed916..2fd5689f65c0 100644 --- a/trunk/drivers/leds/leds-lp5523.c +++ b/trunk/drivers/leds/leds-lp5523.c @@ -974,7 +974,7 @@ static int __devinit lp5523_probe(struct i2c_client *client, fail2: for (i = 0; i < chip->num_leds; i++) { led_classdev_unregister(&chip->leds[i].cdev); - cancel_work_sync(&chip->leds[i].brightness_work); + flush_work(&chip->leds[i].brightness_work); } fail1: if (pdata->enable) @@ -993,7 +993,7 @@ static int lp5523_remove(struct i2c_client *client) for (i = 0; i < chip->num_leds; i++) { led_classdev_unregister(&chip->leds[i].cdev); - cancel_work_sync(&chip->leds[i].brightness_work); + flush_work(&chip->leds[i].brightness_work); } if (chip->pdata->enable)