Input: ad714x - fix up input configuration
authorMichael Hennerich <michael.hennerich@analog.com>
Tue, 17 May 2011 06:17:11 +0000 (23:17 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 17 May 2011 06:20:04 +0000 (23:20 -0700)
Add missing input name and set up parent devices so input devices will
show in proper places in sysfs tree.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Tested-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/misc/ad714x.c

index c431d09..2ceb028 100644 (file)
@@ -1149,6 +1149,8 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
                        input[alloc_idx]->id.bustype = bus_type;
                        input[alloc_idx]->id.product = ad714x->product;
                        input[alloc_idx]->id.version = ad714x->version;
+                       input[alloc_idx]->name = "ad714x_captouch_slider";
+                       input[alloc_idx]->dev.parent = dev;
 
                        error = input_register_device(input[alloc_idx]);
                        if (error)
@@ -1179,6 +1181,8 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
                        input[alloc_idx]->id.bustype = bus_type;
                        input[alloc_idx]->id.product = ad714x->product;
                        input[alloc_idx]->id.version = ad714x->version;
+                       input[alloc_idx]->name = "ad714x_captouch_wheel";
+                       input[alloc_idx]->dev.parent = dev;
 
                        error = input_register_device(input[alloc_idx]);
                        if (error)
@@ -1212,6 +1216,8 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
                        input[alloc_idx]->id.bustype = bus_type;
                        input[alloc_idx]->id.product = ad714x->product;
                        input[alloc_idx]->id.version = ad714x->version;
+                       input[alloc_idx]->name = "ad714x_captouch_pad";
+                       input[alloc_idx]->dev.parent = dev;
 
                        error = input_register_device(input[alloc_idx]);
                        if (error)
@@ -1240,6 +1246,8 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
                input[alloc_idx]->id.bustype = bus_type;
                input[alloc_idx]->id.product = ad714x->product;
                input[alloc_idx]->id.version = ad714x->version;
+               input[alloc_idx]->name = "ad714x_captouch_button";
+               input[alloc_idx]->dev.parent = dev;
 
                error = input_register_device(input[alloc_idx]);
                if (error)