History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input subsystem fixes from Dmitry Torokhov: "Two small driver fixups and a documentation update for managed input devices" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - fix wacom_set_report retry logic Input: document that unregistering managed devices is not necessary Input: lm8323 - fix checking PWM interrupt status

Linus Torvalds committed 13 years ago

Commit e9cf59a2 parents 7c45512 9937c023 files · +18 −6Browse files

Unified · Split

3 files
  1. drivers/input/input.c +14 −2
  2. drivers/input/keyboard/lm8323.c +1 −1
  3. drivers/input/tablet/wacom_sys.c +3 −3
drivers/input/input.c+14−2
@@ -1785,12 +1785,13 @@ static void devm_input_device_release(struct device *dev, void *res) · 1784 unmodified lines
17851785 * its driver (or binding fails). Once managed input device is allocated,
17861786 * it is ready to be set up and registered in the same fashion as regular
17871787 * input device. There are no special devm_input_device_[un]register()
1788− * variants, regular ones work with both managed and unmanaged devices.
1788+ * variants, regular ones work with both managed and unmanaged devices,
1789+ * should you need them. In most cases however, managed input device need
1790+ * not be explicitly unregistered or freed.
17891791 *
17901792 * NOTE: the owner device is set up as parent of input device and users
17911793 * should not override it.
17921794 */
1793−
17941795 struct input_dev *devm_input_allocate_device(struct device *dev)
17951796 {
17961797 struct input_dev *input;
@@ -2004,6 +2005,17 @@ static void devm_input_device_unregister(struct device *dev, void *res) · 207 unmodified lines
20042005 * Once device has been successfully registered it can be unregistered
20052006 * with input_unregister_device(); input_free_device() should not be
20062007 * called in this case.
2008+ *
2009+ * Note that this function is also used to register managed input devices
2010+ * (ones allocated with devm_input_allocate_device()). Such managed input
2011+ * devices need not be explicitly unregistered or freed, their tear down
2012+ * is controlled by the devres infrastructure. It is also worth noting
2013+ * that tear down of managed input devices is internally a 2-step process:
2014+ * registered managed input device is first unregistered, but stays in
2015+ * memory and can still handle input_event() calls (although events will
2016+ * not be delivered anywhere). The freeing of managed input device will
2017+ * happen later, when devres stack is unwound to the point where device
2018+ * allocation was made.
20072019 */
20082020 int input_register_device(struct input_dev *dev)
20092021 {
drivers/input/keyboard/lm8323.c+1−1
@@ -398,7 +398,7 @@ static irqreturn_t lm8323_irq(int irq, void *_lm) · 397 unmodified lines
398398 lm8323_configure(lm);
399399 }
400400 for (i = 0; i < LM8323_NUM_PWMS; i++) {
401− if (ints & (1 << (INT_PWM1 + i))) {
401+ if (ints & (INT_PWM1 << i)) {
402402 dev_vdbg(&lm->client->dev,
403403 "pwm%d engine completed\n", i);
404404 pwm_done(&lm->pwm[i]);
drivers/input/tablet/wacom_sys.c+3−3
@@ -553,10 +553,10 @@ static int wacom_set_device_mode(struct usb_interface *intf, int report_id, int · 552 unmodified lines
553553 if (!rep_data)
554554 return error;
555555
556− rep_data[0] = report_id;
557− rep_data[1] = mode;
558−
559556 do {
557+ rep_data[0] = report_id;
558+ rep_data[1] = mode;
559+
560560 error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT,
561561 report_id, rep_data, length, 1);
562562 if (error >= 0)