kernel/git/stable/linux.git/drivers/media/IR, branch linux-2.6.37.y

Input: rc-keymap - return KEY_RESERVED for unknown mappings

2011-02-17T23:14:09+00:00

commit 54e74b87e2a9941c6fa82189f270b47cceeba714 upstream. Do not respond with -EINVAL to EVIOCGKEYCODE for not-yet-mapped scancodes, but rather return KEY_RESERVED. This fixes breakage with Ubuntu's input-kbd utility that stopped returning full keymaps for remote controls. Tested-by: Mauro Carvalho Chehab Tested-by: Mark Lord Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman

[media] mceusb: set a default rx timeout

2010-12-20T16:11:18+00:00

Its possible for the call to read rx timeout from the hardware to fail, in which case we end up with a bogus rx timeout value. Set a default one when filling in the rc struct, and we'll just overwrite it later w/the value from hardware, but if that read fails, we've at least got a sane rx timeout value to work with (1000ms is the default value I've seen returned on most if not all mceusb hardware). Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] mceusb: fix inverted mask inversion logic

2010-12-20T16:11:17+00:00

As it turns out, somewhere along the way, we managed to invert the meaning of the tx_mask_inverted flag. Looking back over the old lirc driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list. Now we have a tx_mask_inverted flag set to 1 for all the devices that were in the list, and set tx_mask_inverted to that flag value, which is actually the opposite of what we used to set, causing set_tx_mask to use the wrong mask setting option. Since there seem to be more devices with inverted masks than not (using the original device as the baseline for inverted vs. normal), lets just call the ones currently marked as inverted normal instead, and flip the if/else actions that key off of the inverted flag. Note: the problem only cropped up if a call to set_tx_mask was made, if no mask was set, the device would work just fine, which is why this managed to slip though w/o getting noticed until now. Tested successfully by myself and Dennis Gilmore. Reported-by: Dennis Gilmore Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] mceusb: add another Fintek device ID

2010-12-20T16:11:16+00:00

Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] lirc_dev: fixes in lirc_dev_fop_read()

2010-12-20T16:11:15+00:00

This makes several changes but they're in one function and sort of related: "buf" was leaked on error. The leak if we try to read an invalid length is the main concern because it could be triggered over and over. If the copy_to_user() failed, then the original code returned the number of bytes remaining. read() is supposed to be the opposite way, where we return the number of bytes copied. I changed it to just return -EFAULT on errors. Also I changed the debug output from "-EFAULT" to just "" because it isn't -EFAULT necessarily. And since we go though that path if the length is invalid now, there was another debug print that I removed. Signed-off-by: Dan Carpenter Reviewed-by: Jarod Wilson Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] lirc_dev: stray unlock in lirc_dev_fop_poll()

2010-12-20T16:11:14+00:00

We shouldn't unlock here. I think this was a cut and paste error. Signed-off-by: Dan Carpenter Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] rc: fix sysfs entry for mceusb and streamzap

2010-12-20T16:11:13+00:00

When trying to create persistent device names for mceusb and streamzap devices, I noticed that their respective drivers are not creating the rc device as a child of the USB device. Rather it creates it as virtual device. As a result, udev cannot use the USB device information to create persistent device names for event and lirc devices associated with the rc device. Not having persistent device names makes it more difficult to make use of the devices in userspace as their names can change. Signed-off-by: Paul Bender Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] streamzap: merge timeout space with trailing space

2010-12-20T16:11:11+00:00

There are cases where we get an ending space, and our trailing timeout space then gets sent right after it, which breaks repeat, at least for lirc userspace decoding. Merge the two spaces by way of using ir_raw_event_store_filter, set a timeout value, and we're back to good. Successfully tested with streamzap and windows mce remotes. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] mceusb: fix keybouce issue after parser simplification

2010-12-20T16:11:10+00:00

Something I failed to notice while testing the mceusb RLE buffer decoding simplification patches was that we were getting an extra event from the previously pressed key. As was pointed out to me on irc by Maxim, this is actually due to using ir_raw_event_store_with_filter without having set up a timeout value. The hardware has a timeout value we're now reading and storing, which properly enables the transition to idle in the raw event storage process, and makes IR decode behave correctly w/o keybounce. Also remove no-longer-used ir_raw_event struct from mceusb_dev struct and add as-yet-unused enable flags for carrier reports and learning mode, which I'll hopefully start wiring up sooner than later. While looking into that, found evidence that 0x9f 0x15 responses are only non-zero when the short-range learning sensor is used, so correct the debug spew message, and then suppress it when using the standard long-range sensor. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] IR: add tv power scancode to rc6 mce keymap

2010-12-20T16:11:09+00:00

And clean up some stray spaces. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab