Merge tag 'v4.3-rc3' into next

Merge with Linux 4.3-rc3 to bring in MFD DA9062 changes to merge DA9062
OnKey driver.
This commit is contained in:
Dmitry Torokhov
2015-09-29 16:28:52 -07:00
10159 changed files with 562719 additions and 255386 deletions

View File

@@ -205,7 +205,7 @@ static void tgfx_attach(struct parport *pp)
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]);
goto err_unreg_devs;
}