diff options
| author | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-02-21 06:14:25 +0000 |
|---|---|---|
| committer | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-02-21 06:14:25 +0000 |
| commit | 755630a02ff831088875476c8febbf1135a9a1ad (patch) | |
| tree | 49404fafe44c47a66e98e0cc1d1e0080568574e6 /target/linux | |
| parent | b022d5b04d446812ef0f663c6a958687e4db91b9 (diff) | |
[xburst] Refresh patches for 2.6.37.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25644 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -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); - |