aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2009-07-23 09:50:43 -0400
committerAnton Vorontsov <avorontsov@ru.mvista.com>2009-09-04 12:11:17 -0400
commit32bb0e0c778a4a6cd4534a5b98f08cd45e9ab5b9 (patch)
tree659b3878dcb901a1f17b7944c7ca721ce1787695 /drivers/input
parent8d631ccff8d90fce77b42f01b3872595c599cbf9 (diff)
wm97xx-core: Pass platform_data to battery
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/wm97xx-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index 2957d48e0045..cf8cbc60d5ce 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -561,6 +561,7 @@ static void wm97xx_ts_input_close(struct input_dev *idev)
561static int wm97xx_probe(struct device *dev) 561static int wm97xx_probe(struct device *dev)
562{ 562{
563 struct wm97xx *wm; 563 struct wm97xx *wm;
564 struct wm97xx_pdata *pdata = dev->platform_data;
564 int ret = 0, id = 0; 565 int ret = 0, id = 0;
565 566
566 wm = kzalloc(sizeof(struct wm97xx), GFP_KERNEL); 567 wm = kzalloc(sizeof(struct wm97xx), GFP_KERNEL);
@@ -656,6 +657,7 @@ static int wm97xx_probe(struct device *dev)
656 } 657 }
657 platform_set_drvdata(wm->battery_dev, wm); 658 platform_set_drvdata(wm->battery_dev, wm);
658 wm->battery_dev->dev.parent = dev; 659 wm->battery_dev->dev.parent = dev;
660 wm->battery_dev->dev.platform_data = pdata;
659 ret = platform_device_add(wm->battery_dev); 661 ret = platform_device_add(wm->battery_dev);
660 if (ret < 0) 662 if (ret < 0)
661 goto batt_reg_err; 663 goto batt_reg_err;
@@ -669,6 +671,7 @@ static int wm97xx_probe(struct device *dev)
669 } 671 }
670 platform_set_drvdata(wm->touch_dev, wm); 672 platform_set_drvdata(wm->touch_dev, wm);
671 wm->touch_dev->dev.parent = dev; 673 wm->touch_dev->dev.parent = dev;
674 wm->touch_dev->dev.platform_data = pdata;
672 ret = platform_device_add(wm->touch_dev); 675 ret = platform_device_add(wm->touch_dev);
673 if (ret < 0) 676 if (ret < 0)
674 goto touch_reg_err; 677 goto touch_reg_err;