aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/jz4740-battery.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index 02414db6a94c..763f894ed188 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -39,7 +39,7 @@ struct jz_battery {
39 int irq; 39 int irq;
40 int charge_irq; 40 int charge_irq;
41 41
42 struct mfd_cell *cell; 42 const struct mfd_cell *cell;
43 43
44 int status; 44 int status;
45 long voltage; 45 long voltage;
@@ -258,7 +258,7 @@ static int __devinit jz_battery_probe(struct platform_device *pdev)
258 return -ENOMEM; 258 return -ENOMEM;
259 } 259 }
260 260
261 jz_battery->cell = pdev->dev.platform_data; 261 jz_battery->cell = mfd_get_cell(pdev);
262 262
263 jz_battery->irq = platform_get_irq(pdev, 0); 263 jz_battery->irq = platform_get_irq(pdev, 0);
264 if (jz_battery->irq < 0) { 264 if (jz_battery->irq < 0) {