From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 29 Sep 2015 23:28:52 +0000 (-0700)
Subject: Merge tag 'v4.3-rc3' into next
X-Git-Tag: firefly_0821_release~176^2~541^2~15^2~56
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8f697e574012cc73b6b0dcbf30d88a3a0f43b78f;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v4.3-rc3' into next

Merge with Linux 4.3-rc3 to bring in MFD DA9062 changes to merge DA9062
OnKey driver.
---

8f697e574012cc73b6b0dcbf30d88a3a0f43b78f
diff --cc drivers/input/joystick/turbografx.c
index 5f7382af70c9,891797ad76bc..01e8ea92b9ad
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@@ -205,8 -196,9 +205,8 @@@ static void tgfx_attach(struct parport 
  		if (n_buttons[i] < 1)
  			continue;
  
- 		if (n_buttons[i] > 6) {
+ 		if (n_buttons[i] > ARRAY_SIZE(tgfx_buttons)) {
  			printk(KERN_ERR "turbografx.c: Invalid number of buttons %d\n", n_buttons[i]);
 -			err = -EINVAL;
  			goto err_unreg_devs;
  		}