merge of '178eac00dc5aa8338d42e8e203633bec7817bbf6'
[vuplus_openembedded] / packages / linux / linux-rp-2.6.24 / tosa / 0036-Set-id-to-1-for-wm97xx-subdevices.patch
1 From 9ea478cbd5473f52ca036cccc00dddad717d7861 Mon Sep 17 00:00:00 2001
2 From: Dmitry Baryshkov <dbaryshkov@gmail.com>
3 Date: Wed, 30 Jan 2008 19:27:13 +0300
4 Subject: [PATCH 36/64] Set id to -1 for wm97xx subdevices
5
6 Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
7 ---
8  drivers/input/touchscreen/wm97xx-core.c |    4 ++--
9  1 files changed, 2 insertions(+), 2 deletions(-)
10
11 diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
12 index 27a0a99..e066acc 100644
13 --- a/drivers/input/touchscreen/wm97xx-core.c
14 +++ b/drivers/input/touchscreen/wm97xx-core.c
15 @@ -592,7 +592,7 @@ static int wm97xx_probe(struct device *dev)
16         wm->gpio[5] = wm97xx_reg_read(wm, AC97_MISC_AFE);
17  
18         /* register our battery device */
19 -       wm->battery_dev = platform_device_alloc("wm97xx-battery", 0);
20 +       wm->battery_dev = platform_device_alloc("wm97xx-battery", -1);
21         if (!wm->battery_dev)
22                 goto batt_err;
23         platform_set_drvdata(wm->battery_dev, wm);
24 @@ -603,7 +603,7 @@ static int wm97xx_probe(struct device *dev)
25  
26         /* register our extended touch device (for machine specific
27          * extensions) */
28 -       wm->touch_dev = platform_device_alloc("wm97xx-touch", 0);
29 +       wm->touch_dev = platform_device_alloc("wm97xx-touch", -1);
30         if (!wm->touch_dev)
31                 goto touch_err;
32         platform_set_drvdata(wm->touch_dev, wm);
33 -- 
34 1.5.3.8
35