]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - rpmsg/rpmsg.git/commitdiff
Merge tag 'v4.10-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 Jan 2017 20:37:43 +0000 (12:37 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 Jan 2017 20:37:43 +0000 (12:37 -0800)
Sync up with mainline to bring up improvements in various subsystems.

1  2 
drivers/input/joystick/xpad.c
drivers/input/keyboard/cros_ec_keyb.c
drivers/input/misc/arizona-haptics.c
drivers/input/misc/tps65218-pwrbutton.c
drivers/input/mouse/trackpoint.c
drivers/input/serio/i8042-x86ia64io.h
drivers/input/touchscreen/elants_i2c.c

Simple merge
index 165c722408aaa37128e9e56ebf88674b0e0ea4f2,25943e9bc8bff96a3df9417c9e7e85d3fa16cbee..87d071ae21da0e04e86dda1f5baae97fccd19d22
@@@ -265,13 -245,10 +245,9 @@@ static int cros_ec_keyb_probe(struct pl
        if (!idev)
                return -ENOMEM;
  
-       if (!ec->irq) {
-               dev_err(dev, "no EC IRQ specified\n");
-               return -EINVAL;
-       }
        ckdev->ec = ec;
+       ckdev->notifier.notifier_call = cros_ec_keyb_work;
        ckdev->dev = dev;
 -      dev_set_drvdata(dev, ckdev);
  
        idev->name = CROS_EC_DEV_NAME;
        idev->phys = ec->phys_name;
Simple merge
Simple merge
Simple merge