aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2011-05-17 02:17:11 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-05-17 02:20:04 -0400
commitdc5f4f5e9a3434bfe925f05db9db2908fbab771f (patch)
tree228a286cc9db31efbd3e5e599e0306be6fa9768d /drivers/input/misc
parent9cb6cfae4e792d9f92612dd57ee1e3ff218f17a6 (diff)
Input: ad714x - fix up input configuration
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>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/ad714x.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/misc/ad714x.c b/drivers/input/misc/ad714x.c
index c431d09e401a..2ceb0289a757 100644
--- a/drivers/input/misc/ad714x.c
+++ b/drivers/input/misc/ad714x.c
@@ -1149,6 +1149,8 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
1149 input[alloc_idx]->id.bustype = bus_type; 1149 input[alloc_idx]->id.bustype = bus_type;
1150 input[alloc_idx]->id.product = ad714x->product; 1150 input[alloc_idx]->id.product = ad714x->product;
1151 input[alloc_idx]->id.version = ad714x->version; 1151 input[alloc_idx]->id.version = ad714x->version;
1152 input[alloc_idx]->name = "ad714x_captouch_slider";
1153 input[alloc_idx]->dev.parent = dev;
1152 1154
1153 error = input_register_device(input[alloc_idx]); 1155 error = input_register_device(input[alloc_idx]);
1154 if (error) 1156 if (error)
@@ -1179,6 +1181,8 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
1179 input[alloc_idx]->id.bustype = bus_type; 1181 input[alloc_idx]->id.bustype = bus_type;
1180 input[alloc_idx]->id.product = ad714x->product; 1182 input[alloc_idx]->id.product = ad714x->product;
1181 input[alloc_idx]->id.version = ad714x->version; 1183 input[alloc_idx]->id.version = ad714x->version;
1184 input[alloc_idx]->name = "ad714x_captouch_wheel";
1185 input[alloc_idx]->dev.parent = dev;
1182 1186
1183 error = input_register_device(input[alloc_idx]); 1187 error = input_register_device(input[alloc_idx]);
1184 if (error) 1188 if (error)
@@ -1212,6 +1216,8 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
1212 input[alloc_idx]->id.bustype = bus_type; 1216 input[alloc_idx]->id.bustype = bus_type;
1213 input[alloc_idx]->id.product = ad714x->product; 1217 input[alloc_idx]->id.product = ad714x->product;
1214 input[alloc_idx]->id.version = ad714x->version; 1218 input[alloc_idx]->id.version = ad714x->version;
1219 input[alloc_idx]->name = "ad714x_captouch_pad";
1220 input[alloc_idx]->dev.parent = dev;
1215 1221
1216 error = input_register_device(input[alloc_idx]); 1222 error = input_register_device(input[alloc_idx]);
1217 if (error) 1223 if (error)
@@ -1240,6 +1246,8 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
1240 input[alloc_idx]->id.bustype = bus_type; 1246 input[alloc_idx]->id.bustype = bus_type;
1241 input[alloc_idx]->id.product = ad714x->product; 1247 input[alloc_idx]->id.product = ad714x->product;
1242 input[alloc_idx]->id.version = ad714x->version; 1248 input[alloc_idx]->id.version = ad714x->version;
1249 input[alloc_idx]->name = "ad714x_captouch_button";
1250 input[alloc_idx]->dev.parent = dev;
1243 1251
1244 error = input_register_device(input[alloc_idx]); 1252 error = input_register_device(input[alloc_idx]);
1245 if (error) 1253 if (error)