Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[mv-sheeva.git] / drivers / power / wm97xx_battery.c

diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index 6ea3cb5837c707963784555aabafe14c35b0b48a..94c70650aafc90275fd24d74b798d6d66f91263c 100644 (file)
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -23,10 +23,11 @@
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
 #include <linux/irq.h>
+#include <linux/slab.h>
 
 static DEFINE_MUTEX(bat_lock);
 static struct work_struct bat_work;
-struct mutex work_lock;
+static struct mutex work_lock;
 static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;
 static struct wm97xx_batt_info *gpdata;
 static enum power_supply_property *prop;
@@ -203,7 +204,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
                        goto err2;
                ret = request_irq(gpio_to_irq(pdata->charge_gpio),
                                wm97xx_chrg_irq, IRQF_DISABLED,
-                               "AC Detect", 0);
+                               "AC Detect", dev);
                if (ret)
                        goto err2;
                props++;        /* POWER_SUPPLY_PROP_STATUS */