diff options
author | Igor M. Liplianin <liplianin@me.by> | 2011-02-25 16:41:22 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:32:22 -0400 |
commit | feb16e9833ad06ac00f23c1abf1e7d649192e3f5 (patch) | |
tree | c4aa85e3aa695c5a270b1ad3258bb29491975b88 /drivers/media/dvb | |
parent | ba0fd56a4fbb92999554a2e417924796c2ad2f8f (diff) |
[media] dw2102: Extend keymap parameter for not used remote
Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dw2102.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c index 2c307ba0d28b..21be0cca3c89 100644 --- a/drivers/media/dvb/dvb-usb/dw2102.c +++ b/drivers/media/dvb/dvb-usb/dw2102.c | |||
@@ -87,7 +87,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info 2=xfer 4=rc(or-able))." | |||
87 | /* keymaps */ | 87 | /* keymaps */ |
88 | static int ir_keymap; | 88 | static int ir_keymap; |
89 | module_param_named(keymap, ir_keymap, int, 0644); | 89 | module_param_named(keymap, ir_keymap, int, 0644); |
90 | MODULE_PARM_DESC(keymap, "set keymap 0=default 1=dvbworld 2=tevii 3=tbs ..."); | 90 | MODULE_PARM_DESC(keymap, "set keymap 0=default 1=dvbworld 2=tevii 3=tbs ..." |
91 | " 256=none"); | ||
91 | 92 | ||
92 | /* demod probe */ | 93 | /* demod probe */ |
93 | static int demod_probe = 1; | 94 | static int demod_probe = 1; |
@@ -1089,7 +1090,8 @@ static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | |||
1089 | if ((ir_keymap > 0) && (ir_keymap <= ARRAY_SIZE(keys_tables))) { | 1090 | if ((ir_keymap > 0) && (ir_keymap <= ARRAY_SIZE(keys_tables))) { |
1090 | keymap = keys_tables[ir_keymap - 1].rc_keys ; | 1091 | keymap = keys_tables[ir_keymap - 1].rc_keys ; |
1091 | keymap_size = keys_tables[ir_keymap - 1].rc_keys_size; | 1092 | keymap_size = keys_tables[ir_keymap - 1].rc_keys_size; |
1092 | } | 1093 | } else if (ir_keymap > ARRAY_SIZE(keys_tables)) |
1094 | return 0; /* none */ | ||
1093 | 1095 | ||
1094 | *state = REMOTE_NO_KEY_PRESSED; | 1096 | *state = REMOTE_NO_KEY_PRESSED; |
1095 | if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { | 1097 | if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { |