]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
DVB: dvb-usb-remote - fix oops when changing keymap
authorOlaf Kirch <olaf.kirch@oracle.com>
Fri, 13 Apr 2007 05:18:44 +0000 (01:18 -0400)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 14 Apr 2007 01:35:39 +0000 (18:35 -0700)
DVB USB remotes do not support changing keycode maps but set
input_dev->keycodesize and input_dev->keycodemax without setting
input_dev->keycode. This causes kernel oops when user tries to
look up (or change) current keymap.

While the proper fix would be to make remotes handle keymap changes
we'll just remove keycodemax and keycodesize initialization so
EVIOCGKEYCODE and EVIOCSKEYCODE will simply return -EINVAL.

http://bugzilla.kernel.org/show_bug.cgi?id=8312

Signed-off-by: olaf.kirch@oracle.com
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/media/dvb/dvb-usb/dvb-usb-remote.c

index 9511a31c8f506bc90296133a8974564191c4ccbb..68ed3a788083dd1a69124fa430e440c49d55bd49 100644 (file)
@@ -107,8 +107,6 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
                return -ENOMEM;
 
        input_dev->evbit[0] = BIT(EV_KEY);
-       input_dev->keycodesize = sizeof(unsigned char);
-       input_dev->keycodemax = KEY_MAX;
        input_dev->name = "IR-receiver inside an USB DVB receiver";
        input_dev->phys = d->rc_phys;
        usb_to_input_id(d->udev, &input_dev->id);