aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/xburst/patches-2.6.36/300-battery-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/xburst/patches-2.6.36/300-battery-fixes.patch')
-rw-r--r--target/linux/xburst/patches-2.6.36/300-battery-fixes.patch64
1 files changed, 0 insertions, 64 deletions
diff --git a/target/linux/xburst/patches-2.6.36/300-battery-fixes.patch b/target/linux/xburst/patches-2.6.36/300-battery-fixes.patch
deleted file mode 100644
index 1aadb6acb2..0000000000
--- a/target/linux/xburst/patches-2.6.36/300-battery-fixes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2d435d52c63e4dd544938bad638ecd518cc04d1c Mon Sep 17 00:00:00 2001
-From: Lars-Peter Clausen <lars@metafoo.de>
-Date: Tue, 26 Oct 2010 20:13:40 +0200
-Subject: [PATCH] POWER: jz4740-battery: Protect against concurrent battery readings
-
-We can not handle more then one ADC request at a time to the battery. The patch
-adds a mutex around the ADC read code to ensure this.
-
-Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
-
-jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()
-
-Signed-off-by: Axel Lin <axel.lin@gmail.com>
-Acked-By: Lars-Peter Clausen <lars@metafoo.de>
-Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
----
- drivers/power/jz4740-battery.c | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
---- 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;
- }
-
-@@ -291,6 +297,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);
-
-@@ -383,6 +390,7 @@ static int __devexit jz_battery_remove(s
-
- iounmap(jz_battery->base);
- release_mem_region(jz_battery->mem->start, resource_size(jz_battery->mem));
-+ kfree(jz_battery);
-
- return 0;
- }