Tiny input update
Subsystems (2)
Linus,
Please consider pulling from:
www.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
The tree contains several one-liners, mostly dealing with the breakages introduced by input dynalloc conversion:
Changes:
Input: adbhid - fix OOPS introduced by dynalloc conversion (Paul Mackerras)
Input: lkkbd - fix debug message in lkkbd_interrupt()
Input: pcspkr - fix setting name and phys for the device
Input: fix input_dev registration message
Input: evdev - allow querying SW state from compat ioctl
Input: evdev - allow querying EV_SW bits from compat_ioctl
The combined patch is below.
Thanks!
Signature · 1 line
Dmitry
drivers/input/evdev.c +4 -0
@@ -565,6 +565,7 @@ static long evdev_ioctl_compat(struct ficase EV_LED : bits = dev->ledbit; max =LED_MAX ;break ;case EV_SND : bits = dev->sndbit; max =SND_MAX ;break ;case EV_FF : bits = dev->ffbit; max =FF_MAX ;break ; +case EV_SW : bits = dev->swbit; max =SW_MAX ;break ;default :return -EINVAL ; }bit_to_user (bits, max);
@@ -579,6 +580,9 @@ static long evdev_ioctl_compat(struct fiif (_IOC_NR (cmd) ==_IOC_NR (EVIOCGSND (0 )))bit_to_user (dev->snd,SND_MAX ); +if (_IOC_NR (cmd) ==_IOC_NR (EVIOCGSW (0 ))) +bit_to_user (dev->sw,SW_MAX ); +if (_IOC_NR (cmd) ==_IOC_NR (EVIOCGNAME (0 ))) {int len;if (!dev->name)return -ENOENT ;
drivers/input/input.c +1 -1
@@ -730,7 +730,7 @@ static void input_register_classdevice(s "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1); path =kobject_get_path (&dev->cdev.class->subsys.kset.kobj,GFP_KERNEL ); -printk (KERN_INFO "input: %s/%s as %s\n" , +printk (KERN_INFO "input: %s as %s/%s\n" , dev->name ? dev->name :"Unspecified device" , path ? path :"" , dev->cdev.class_id);kfree (path);
drivers/input/keyboard/lkkbd.c +1 -1
@@ -441,7 +441,7 @@ lkkbd_interrupt (struct serio *serio, uninput_sync (lk->dev);break ;case LK_METRONOME : -DBG (KERN_INFO "Got %#d and don't " +DBG (KERN_INFO "Got LK_METRONOME and don't " "know how to handle...\n" );break ;case LK_OUTPUT_ERROR :
drivers/input/misc/pcspkr.c +1 -1
@@ -71,7 +71,7 @@ static int __init pcspkr_init(void)return -ENOMEM ; pcspkr_dev->name ="PC Speaker" ; - pcspkr_dev->name ="isa0061/input0" ; + pcspkr_dev->phys ="isa0061/input0" ; pcspkr_dev->id.bustype =BUS_ISA ; pcspkr_dev->id.vendor =0x001f ; pcspkr_dev->id.product =0x0001 ;
drivers/macintosh/adbhid.c +1 -0
@@ -723,6 +723,7 @@ adbhid_input_register(int id, int defaulsprintf (hid->phys,"adb%d:%d.%02x/input" , id, default_id, original_handler_id); + hid->input = input_dev; hid->id = default_id; hid->original_handler_id = original_handler_id; hid->current_handler_id = current_handler_id;
Quoted 17 lines · Dmitry Torokhov
Linus,
Please consider pulling from:
www.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
The tree contains several one-liners, mostly dealing with the breakages introduced by input dynalloc conversion:
Changes:
Input: adbhid - fix OOPS introduced by dynalloc conversion (Paul Mackerras)
Input: lkkbd - fix debug message inlkkbd_interrupt()
Input: pcspkr - fix setting name and phys for the device
Input: fixinput_devregistration message
Input: evdev - allow querying SW state from compat ioctl
Input: evdev - allow queryingEV_SWbits fromcompat_ioctl
Quoted 1 line
The combined patch is below.
All the changes have my OK. Linus, please do the pull. Dmitry: Thanks.
Signature · 2 lines
Vojtech Pavlik SuSE Labs, SuSE CR