]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 20:40:41 +0000 (12:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 20:40:41 +0000 (12:40 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: bcm5974 - set BUTTONPAD property
  Input: serio_raw - return proper result when serio_raw_write fails
  Input: serio_raw - really signal HUP upon disconnect
  Input: serio_raw - remove stray semicolon
  Input: revert some over-zealous conversions to module_platform_driver()

1  2 
drivers/input/mouse/bcm5974.c

index cf87f8b18e34479c14bbfe49d1ca95495ecf4a5d,913e9fa4c810fd5b7dbf4bf9e0cd9ffeb6798357..927e479c26494506df371e9cc4757d7b032ea3f4
@@@ -433,6 -433,9 +433,9 @@@ static void setup_events_to_report(stru
        __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
        __set_bit(BTN_LEFT, input_dev->keybit);
  
+       if (cfg->caps & HAS_INTEGRATED_BUTTON)
+               __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
        input_set_events_per_packet(input_dev, 60);
  }
  
@@@ -940,4 -943,16 +943,4 @@@ static struct usb_driver bcm5974_drive
        .supports_autosuspend   = 1,
  };
  
 -static int __init bcm5974_init(void)
 -{
 -      return usb_register(&bcm5974_driver);
 -}
 -
 -static void __exit bcm5974_exit(void)
 -{
 -      usb_deregister(&bcm5974_driver);
 -}
 -
 -module_init(bcm5974_init);
 -module_exit(bcm5974_exit);
 -
 +module_usb_driver(bcm5974_driver);