diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2011-02-21 06:14:25 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2011-02-21 06:14:25 +0000 |
| commit | 3ba2dbeb1d34672ba9b809dea4dd831a56858c4c (patch) | |
| tree | e65fa1b88ad27424c50d5db90779cca1bad7d476 /target | |
| parent | 5728d13d0280c28612b7a7d0cf3a59bd35fa67bd (diff) | |
| download | upstream-3ba2dbeb1d34672ba9b809dea4dd831a56858c4c.tar.gz upstream-3ba2dbeb1d34672ba9b809dea4dd831a56858c4c.tar.bz2 upstream-3ba2dbeb1d34672ba9b809dea4dd831a56858c4c.zip | |
Refresh patches for 2.6.37.1
SVN-Revision: 25644
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/xburst/patches-2.6.37/300-battery-fixes.patch | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/target/linux/xburst/patches-2.6.37/300-battery-fixes.patch b/target/linux/xburst/patches-2.6.37/300-battery-fixes.patch index 947c6711c3..2f014e74e0 100644 --- a/target/linux/xburst/patches-2.6.37/300-battery-fixes.patch +++ b/target/linux/xburst/patches-2.6.37/300-battery-fixes.patch @@ -1,33 +1,6 @@ --- a/drivers/power/jz4740-battery.c +++ b/drivers/power/jz4740-battery.c -@@ -47,6 +47,8 @@ struct jz_battery { - - struct power_supply battery; - struct delayed_work work; -+ -+ struct mutex lock; - }; - - static inline struct jz_battery *psy_to_jz_battery(struct power_supply *psy) -@@ -68,6 +70,8 @@ static long jz_battery_read_voltage(stru - unsigned long val; - long voltage; - -+ mutex_lock(&battery->lock); -+ - INIT_COMPLETION(battery->read_completion); - - enable_irq(battery->irq); -@@ -91,6 +95,8 @@ static long jz_battery_read_voltage(stru - battery->cell->disable(battery->pdev); - disable_irq(battery->irq); - -+ mutex_unlock(&battery->lock); -+ - return voltage; - } - -@@ -240,6 +246,11 @@ static int __devinit jz_battery_probe(st +@@ -246,6 +246,11 @@ static int __devinit jz_battery_probe(st struct jz_battery *jz_battery; struct power_supply *battery; @@ -39,11 +12,3 @@ jz_battery = kzalloc(sizeof(*jz_battery), GFP_KERNEL); if (!jz_battery) { dev_err(&pdev->dev, "Failed to allocate driver structure\n"); -@@ -291,6 +302,7 @@ static int __devinit jz_battery_probe(st - jz_battery->pdev = pdev; - - init_completion(&jz_battery->read_completion); -+ mutex_init(&jz_battery->lock); - - INIT_DELAYED_WORK(&jz_battery->work, jz_battery_work); - |