---

yaml --- r: 283471 b: refs/heads/master c: daf22c3 h: refs/heads/master i: 283469: 6f60deb 283467: 2ede0bc 283463: 19389a6 283455: 7825c09 v: v3
git-mirror · Jan 6, 2012 · 98686a6 · 98686a6
1 parent b616e00
commit 98686a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68597986f7db9abbe380af3db6a34b6c83cdf302
+refs/heads/master: daf22c3c4444e10a852a2f460f5cb1a43038bd53
diff --git a/trunk/drivers/power/wm97xx_battery.c b/trunk/drivers/power/wm97xx_battery.c
@@ -25,9 +25,8 @@
 #include <linux/irq.h>
 #include <linux/slab.h>
 
-static DEFINE_MUTEX(bat_lock);
 static struct work_struct bat_work;
-static struct mutex work_lock;
+static DEFINE_MUTEX(work_lock);
 static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;
 static enum power_supply_property *prop;
 
@@ -181,8 +180,6 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
 	if (dev->id != -1)
 		return -EINVAL;
 
-	mutex_init(&work_lock);
-
 	if (!pdata) {
 		dev_err(&dev->dev, "No platform_data supplied\n");
 		return -EINVAL;