diff options
Diffstat (limited to 'drivers/media/rc')
-rw-r--r-- | drivers/media/rc/ene_ir.c | 4 | ||||
-rw-r--r-- | drivers/media/rc/imon.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/ir-raw.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-lme2510.c | 4 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/keymaps/rc-norwood.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/rc-main.c | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c index 1ac49139158d..a43ed6c41bfc 100644 --- a/drivers/media/rc/ene_ir.c +++ b/drivers/media/rc/ene_ir.c | |||
@@ -520,7 +520,7 @@ static void ene_rx_disable(struct ene_device *dev) | |||
520 | dev->rx_enabled = false; | 520 | dev->rx_enabled = false; |
521 | } | 521 | } |
522 | 522 | ||
523 | /* This resets the receiver. Usefull to stop stream of spaces at end of | 523 | /* This resets the receiver. Useful to stop stream of spaces at end of |
524 | * transmission | 524 | * transmission |
525 | */ | 525 | */ |
526 | static void ene_rx_reset(struct ene_device *dev) | 526 | static void ene_rx_reset(struct ene_device *dev) |
@@ -1089,7 +1089,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id) | |||
1089 | if (error < 0) | 1089 | if (error < 0) |
1090 | goto error; | 1090 | goto error; |
1091 | 1091 | ||
1092 | ene_notice("driver has been succesfully loaded"); | 1092 | ene_notice("driver has been successfully loaded"); |
1093 | return 0; | 1093 | return 0; |
1094 | error: | 1094 | error: |
1095 | if (dev && dev->irq >= 0) | 1095 | if (dev && dev->irq >= 0) |
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index f714e1a22c92..ebd68edf5b24 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c | |||
@@ -1293,7 +1293,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf) | |||
1293 | * contain a position coordinate (x,y), with each component ranging | 1293 | * contain a position coordinate (x,y), with each component ranging |
1294 | * from -14 to 14. We want to down-sample this to only 4 discrete values | 1294 | * from -14 to 14. We want to down-sample this to only 4 discrete values |
1295 | * for up/down/left/right arrow keys. Also, when you get too close to | 1295 | * for up/down/left/right arrow keys. Also, when you get too close to |
1296 | * diagonals, it has a tendancy to jump back and forth, so lets try to | 1296 | * diagonals, it has a tendency to jump back and forth, so lets try to |
1297 | * ignore when they get too close. | 1297 | * ignore when they get too close. |
1298 | */ | 1298 | */ |
1299 | if (ictx->product != 0xffdc) { | 1299 | if (ictx->product != 0xffdc) { |
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c index 01f258a2a57a..11c19d8d0ee0 100644 --- a/drivers/media/rc/ir-raw.c +++ b/drivers/media/rc/ir-raw.c | |||
@@ -153,7 +153,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_edge); | |||
153 | * @type: the type of the event that has occurred | 153 | * @type: the type of the event that has occurred |
154 | * | 154 | * |
155 | * This routine (which may be called from an interrupt context) works | 155 | * This routine (which may be called from an interrupt context) works |
156 | * in similiar manner to ir_raw_event_store_edge. | 156 | * in similar manner to ir_raw_event_store_edge. |
157 | * This routine is intended for devices with limited internal buffer | 157 | * This routine is intended for devices with limited internal buffer |
158 | * It automerges samples of same type, and handles timeouts | 158 | * It automerges samples of same type, and handles timeouts |
159 | */ | 159 | */ |
diff --git a/drivers/media/rc/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c index 3c1913926c1a..afae14fd152e 100644 --- a/drivers/media/rc/keymaps/rc-lme2510.c +++ b/drivers/media/rc/keymaps/rc-lme2510.c | |||
@@ -55,7 +55,7 @@ static struct rc_map_table lme2510_rc[] = { | |||
55 | { 0xff40fb04, KEY_MEDIA_REPEAT}, /* Recall */ | 55 | { 0xff40fb04, KEY_MEDIA_REPEAT}, /* Recall */ |
56 | { 0xff40e51a, KEY_PAUSE }, /* Timeshift */ | 56 | { 0xff40e51a, KEY_PAUSE }, /* Timeshift */ |
57 | { 0xff40fd02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */ | 57 | { 0xff40fd02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */ |
58 | { 0xff40f906, KEY_VOLUMEDOWN }, /* Volumne defined as right hand*/ | 58 | { 0xff40f906, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/ |
59 | { 0xff40fe01, KEY_CHANNELUP }, | 59 | { 0xff40fe01, KEY_CHANNELUP }, |
60 | { 0xff40fa05, KEY_CHANNELDOWN }, | 60 | { 0xff40fa05, KEY_CHANNELDOWN }, |
61 | { 0xff40eb14, KEY_ZOOM }, | 61 | { 0xff40eb14, KEY_ZOOM }, |
@@ -76,7 +76,7 @@ static struct rc_map_table lme2510_rc[] = { | |||
76 | { 0xff00bb44, KEY_MEDIA_REPEAT}, /* Recall */ | 76 | { 0xff00bb44, KEY_MEDIA_REPEAT}, /* Recall */ |
77 | { 0xff00b54a, KEY_PAUSE }, /* Timeshift */ | 77 | { 0xff00b54a, KEY_PAUSE }, /* Timeshift */ |
78 | { 0xff00b847, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */ | 78 | { 0xff00b847, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */ |
79 | { 0xff00bc43, KEY_VOLUMEDOWN }, /* Volumne defined as right hand*/ | 79 | { 0xff00bc43, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/ |
80 | { 0xff00b946, KEY_CHANNELUP }, | 80 | { 0xff00b946, KEY_CHANNELUP }, |
81 | { 0xff00bf40, KEY_CHANNELDOWN }, | 81 | { 0xff00bf40, KEY_CHANNELDOWN }, |
82 | { 0xff00f708, KEY_ZOOM }, | 82 | { 0xff00f708, KEY_ZOOM }, |
diff --git a/drivers/media/rc/keymaps/rc-msi-tvanywhere.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c index 18b37facb0dd..fdd213ff1adf 100644 --- a/drivers/media/rc/keymaps/rc-msi-tvanywhere.c +++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c | |||
@@ -29,7 +29,7 @@ static struct rc_map_table msi_tvanywhere[] = { | |||
29 | 29 | ||
30 | { 0x0c, KEY_MUTE }, | 30 | { 0x0c, KEY_MUTE }, |
31 | { 0x0f, KEY_SCREEN }, /* Full Screen */ | 31 | { 0x0f, KEY_SCREEN }, /* Full Screen */ |
32 | { 0x10, KEY_FN }, /* Funtion */ | 32 | { 0x10, KEY_FN }, /* Function */ |
33 | { 0x11, KEY_TIME }, /* Time shift */ | 33 | { 0x11, KEY_TIME }, /* Time shift */ |
34 | { 0x12, KEY_POWER }, | 34 | { 0x12, KEY_POWER }, |
35 | { 0x13, KEY_MEDIA }, /* MTS */ | 35 | { 0x13, KEY_MEDIA }, /* MTS */ |
diff --git a/drivers/media/rc/keymaps/rc-norwood.c b/drivers/media/rc/keymaps/rc-norwood.c index f1c1281fbc17..f9f2fa2819b8 100644 --- a/drivers/media/rc/keymaps/rc-norwood.c +++ b/drivers/media/rc/keymaps/rc-norwood.c | |||
@@ -49,7 +49,7 @@ static struct rc_map_table norwood[] = { | |||
49 | { 0x37, KEY_PLAY }, /* Play */ | 49 | { 0x37, KEY_PLAY }, /* Play */ |
50 | { 0x36, KEY_PAUSE }, /* Pause */ | 50 | { 0x36, KEY_PAUSE }, /* Pause */ |
51 | { 0x2b, KEY_STOP }, /* Stop */ | 51 | { 0x2b, KEY_STOP }, /* Stop */ |
52 | { 0x67, KEY_FASTFORWARD }, /* Foward */ | 52 | { 0x67, KEY_FASTFORWARD }, /* Forward */ |
53 | { 0x66, KEY_REWIND }, /* Rewind */ | 53 | { 0x66, KEY_REWIND }, /* Rewind */ |
54 | { 0x3e, KEY_SEARCH }, /* Auto Scan */ | 54 | { 0x3e, KEY_SEARCH }, /* Auto Scan */ |
55 | { 0x2e, KEY_CAMERA }, /* Capture Video */ | 55 | { 0x2e, KEY_CAMERA }, /* Capture Video */ |
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 5ac1baf45c8e..f53f9c68d38d 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c | |||
@@ -255,7 +255,7 @@ static unsigned int ir_update_mapping(struct rc_dev *dev, | |||
255 | * @rc_map: scancode table to be searched | 255 | * @rc_map: scancode table to be searched |
256 | * @scancode: the desired scancode | 256 | * @scancode: the desired scancode |
257 | * @resize: controls whether we allowed to resize the table to | 257 | * @resize: controls whether we allowed to resize the table to |
258 | * accomodate not yet present scancodes | 258 | * accommodate not yet present scancodes |
259 | * @return: index of the mapping containing scancode in question | 259 | * @return: index of the mapping containing scancode in question |
260 | * or -1U in case of failure. | 260 | * or -1U in case of failure. |
261 | * | 261 | * |
@@ -1037,7 +1037,7 @@ int rc_register_device(struct rc_dev *dev) | |||
1037 | goto out_table; | 1037 | goto out_table; |
1038 | 1038 | ||
1039 | /* | 1039 | /* |
1040 | * Default delay of 250ms is too short for some protocols, expecially | 1040 | * Default delay of 250ms is too short for some protocols, especially |
1041 | * since the timeout is currently set to 250ms. Increase it to 500ms, | 1041 | * since the timeout is currently set to 250ms. Increase it to 500ms, |
1042 | * to avoid wrong repetition of the keycodes. Note that this must be | 1042 | * to avoid wrong repetition of the keycodes. Note that this must be |
1043 | * set after the call to input_register_device(). | 1043 | * set after the call to input_register_device(). |