qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-25 04:57:56 +02:00
Code

[xburst] Refresh patches for 2.6.37.1

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25644 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars 2011-02-21 06:14:25 +00:00
parent b022d5b04d
commit 755630a02f
1 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
target/linux/xburst/patches-2.6.37/300-battery-fixes.patch
View File

@ -1,33 +1,6 @@
--- a/drivers/power/jz4740-battery.c --- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c +++ b/drivers/power/jz4740-battery.c
@@ -47,6 +47,8 @@ struct jz_battery { @@ -246,6 +246,11 @@ static int __devinit jz_battery_probe(st
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
struct jz_battery *jz_battery; struct jz_battery *jz_battery;
struct power_supply *battery; struct power_supply *battery;
@ -39,11 +12,3 @@
jz_battery = kzalloc(sizeof(*jz_battery), GFP_KERNEL); jz_battery = kzalloc(sizeof(*jz_battery), GFP_KERNEL);
if (!jz_battery) { if (!jz_battery) {
dev_err(&pdev->dev, "Failed to allocate driver structure\n"); 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);