summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2009-07-23 15:50:43 +0200
committerAnton Vorontsov <avorontsov@ru.mvista.com>2009-09-04 20:11:17 +0400
commit32bb0e0c778a4a6cd4534a5b98f08cd45e9ab5b9 (patch)
tree659b3878dcb901a1f17b7944c7ca721ce1787695 /drivers/input
parent8d631ccff8d90fce77b42f01b3872595c599cbf9 (diff)
downloadop-kernel-dev-32bb0e0c778a4a6cd4534a5b98f08cd45e9ab5b9.zip
op-kernel-dev-32bb0e0c778a4a6cd4534a5b98f08cd45e9ab5b9.tar.gz
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 2957d48..cf8cbc6 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)
static int wm97xx_probe(struct device *dev)
{
struct wm97xx *wm;
+ struct wm97xx_pdata *pdata = dev->platform_data;
int ret = 0, id = 0;
wm = kzalloc(sizeof(struct wm97xx), GFP_KERNEL);
@@ -656,6 +657,7 @@ static int wm97xx_probe(struct device *dev)
}
platform_set_drvdata(wm->battery_dev, wm);
wm->battery_dev->dev.parent = dev;
+ wm->battery_dev->dev.platform_data = pdata;
ret = platform_device_add(wm->battery_dev);
if (ret < 0)
goto batt_reg_err;
@@ -669,6 +671,7 @@ static int wm97xx_probe(struct device *dev)
}
platform_set_drvdata(wm->touch_dev, wm);
wm->touch_dev->dev.parent = dev;
+ wm->touch_dev->dev.platform_data = pdata;
ret = platform_device_add(wm->touch_dev);
if (ret < 0)
goto touch_reg_err;
OpenPOWER on IntegriCloud