From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 24 Jan 2017 20:37:43 +0000 (-0800)
Subject: Merge tag 'v4.10-rc5' into next
X-Git-Tag: v4.13~1260^2^2~22
X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-bionic-kernel.git;a=commitdiff_plain;h=0cce284537fb42d9c28b9b31038ffc9b464555f5

Merge tag 'v4.10-rc5' into next

Sync up with mainline to bring up improvements in various subsystems.
---

0cce284537fb42d9c28b9b31038ffc9b464555f5
diff --cc drivers/input/keyboard/cros_ec_keyb.c
index 165c722408aa,25943e9bc8bf..87d071ae21da
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@@ -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;