---

yaml --- r: 358589 b: refs/heads/master c: 1a99148 h: refs/heads/master i: 358587: 3a27c93 v: v3
git-mirror · Feb 6, 2013 · 95f6c05 · 95f6c05
1 parent 1f6298b
commit 95f6c05
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 944f7b1dedb859f76a88c8d34ce23a90bf6285a0
+refs/heads/master: 1a9914855d2868112257dbc5771ddc6ebc9b2cab
diff --git a/trunk/drivers/leds/leds-lp5521.c b/trunk/drivers/leds/leds-lp5521.c
@@ -740,6 +740,16 @@ static int lp5521_init_device(struct lp5521_chip *chip)
 	return ret;
 }
 
+static void lp5521_deinit_device(struct lp5521_chip *chip)
+{
+	struct lp5521_platform_data *pdata = chip->pdata;
+
+	if (pdata->enable)
+		pdata->enable(0);
+	if (pdata->release_resources)
+		pdata->release_resources();
+}
+
 static int lp5521_init_led(struct lp5521_led *led,
 				struct i2c_client *client,
 				int chan, struct lp5521_platform_data *pdata)
@@ -865,10 +875,7 @@ static int lp5521_probe(struct i2c_client *client,
 		cancel_work_sync(&chip->leds[i].brightness_work);
 	}
 fail1:
-	if (pdata->enable)
-		pdata->enable(0);
-	if (pdata->release_resources)
-		pdata->release_resources();
+	lp5521_deinit_device(chip);
 	return ret;
 }
 
@@ -885,10 +892,7 @@ static int lp5521_remove(struct i2c_client *client)
 		cancel_work_sync(&chip->leds[i].brightness_work);
 	}
 
-	if (chip->pdata->enable)
-		chip->pdata->enable(0);
-	if (chip->pdata->release_resources)
-		chip->pdata->release_resources();
+	lp5521_deinit_device(chip);
 	return 0;
 }
 

diff --git a/trunk/drivers/leds/leds-lp5523.c b/trunk/drivers/leds/leds-lp5523.c
@@ -923,6 +923,16 @@ static int lp5523_init_device(struct lp5523_chip *chip)
 	return lp5523_detect(client);
 }
 
+static void lp5523_deinit_device(struct lp5523_chip *chip)
+{
+	struct lp5523_platform_data *pdata = chip->pdata;
+
+	if (pdata->enable)
+		pdata->enable(0);
+	if (pdata->release_resources)
+		pdata->release_resources();
+}
+
 static int lp5523_probe(struct i2c_client *client,
 			const struct i2c_device_id *id)
 {
@@ -1009,10 +1019,7 @@ static int lp5523_probe(struct i2c_client *client,
 		flush_work(&chip->leds[i].brightness_work);
 	}
 fail1:
-	if (pdata->enable)
-		pdata->enable(0);
-	if (pdata->release_resources)
-		pdata->release_resources();
+	lp5523_deinit_device(chip);
 	return ret;
 }
 
@@ -1031,10 +1038,7 @@ static int lp5523_remove(struct i2c_client *client)
 		flush_work(&chip->leds[i].brightness_work);
 	}
 
-	if (chip->pdata->enable)
-		chip->pdata->enable(0);
-	if (chip->pdata->release_resources)
-		chip->pdata->release_resources();
+	lp5523_deinit_device(chip);
 	return 0;
 }