diff options
author | Sean Young <sean@mess.org> | 2012-10-17 10:38:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-28 14:46:31 -0400 |
commit | a66cd0b691c730ed751dbf66ffbd0edf18241790 (patch) | |
tree | 5e20dfbcf22bb53f29b39a828ea1f3b6d58e9c3e /drivers/media/rc/winbond-cir.c | |
parent | 107376ba4ef1ecd4249427a9f9c1922fc1d66bb4 (diff) |
[media] winbond-cir: do not rename input name
"54fd321 [media] winbond: remove space from driver name" inadvertently
renamed the input device name.
Signed-off-by: Sean Young <sean@mess.org>
Acked-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc/winbond-cir.c')
-rw-r--r-- | drivers/media/rc/winbond-cir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c index 569d8863f439..45d2fff764bc 100644 --- a/drivers/media/rc/winbond-cir.c +++ b/drivers/media/rc/winbond-cir.c | |||
@@ -184,7 +184,7 @@ enum wbcir_txstate { | |||
184 | }; | 184 | }; |
185 | 185 | ||
186 | /* Misc */ | 186 | /* Misc */ |
187 | #define WBCIR_NAME "winbond-cir" | 187 | #define WBCIR_NAME "Winbond CIR" |
188 | #define WBCIR_ID_FAMILY 0xF1 /* Family ID for the WPCD376I */ | 188 | #define WBCIR_ID_FAMILY 0xF1 /* Family ID for the WPCD376I */ |
189 | #define WBCIR_ID_CHIP 0x04 /* Chip ID for the WPCD376I */ | 189 | #define WBCIR_ID_CHIP 0x04 /* Chip ID for the WPCD376I */ |
190 | #define INVALID_SCANCODE 0x7FFFFFFF /* Invalid with all protos */ | 190 | #define INVALID_SCANCODE 0x7FFFFFFF /* Invalid with all protos */ |
@@ -1007,7 +1007,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id) | |||
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | data->dev->driver_type = RC_DRIVER_IR_RAW; | 1009 | data->dev->driver_type = RC_DRIVER_IR_RAW; |
1010 | data->dev->driver_name = WBCIR_NAME; | 1010 | data->dev->driver_name = DRVNAME; |
1011 | data->dev->input_name = WBCIR_NAME; | 1011 | data->dev->input_name = WBCIR_NAME; |
1012 | data->dev->input_phys = "wbcir/cir0"; | 1012 | data->dev->input_phys = "wbcir/cir0"; |
1013 | data->dev->input_id.bustype = BUS_HOST; | 1013 | data->dev->input_id.bustype = BUS_HOST; |