openwrt-owl/target/linux/s3c24xx/patches-2.6.26/1115--led-Misc-fixes-in-the...

54 lines
1.7 KiB
Diff
Executable File

From 28b29382f1f9c4f6783054527283a8247b2c5cba Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@openmoko.org>
Date: Fri, 25 Jul 2008 23:06:05 +0100
Subject: [PATCH] [led] Misc fixes in the driver code
to_bundle returned the wrong data. The platform_device is the
parent of the class_device used by the LED device class. Return
the correct class.
num_leds was not set to the correct number of registered LEDs. All
loops using num_leds (e.g. module unloading) were not executed at
all.
On removal of the module disable all LEDs.
Signed-Off-By: Holger Freyther <zecke@openmoko.org>
---
drivers/leds/leds-neo1973-gta02.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
index fbb62c4..343550a 100644
--- a/drivers/leds/leds-neo1973-gta02.c
+++ b/drivers/leds/leds-neo1973-gta02.c
@@ -46,7 +46,7 @@ static inline struct gta02_led_priv *to_priv(struct led_classdev *led_cdev)
static inline struct gta02_led_bundle *to_bundle(struct led_classdev *led_cdev)
{
- return dev_get_drvdata(led_cdev->dev);
+ return dev_get_drvdata(led_cdev->dev->parent);
}
static void gta02led_set(struct led_classdev *led_cdev,
@@ -174,6 +174,8 @@ static int __init gta02led_probe(struct platform_device *pdev)
rc = led_classdev_register(&pdev->dev, &lp->cdev);
}
+ bundle->num_leds = i;
+
return 0;
}
@@ -186,6 +188,8 @@ static int gta02led_remove(struct platform_device *pdev)
struct gta02_led_priv *lp = &bundle->led[i];
if (lp->has_pwm)
s3c2410_pwm_disable(&lp->pwm);
+ else
+ gta02led_set(&lp->cdev, 0);
led_classdev_unregister(&lp->cdev);
mutex_destroy(&lp->mutex);
--
1.5.6.3