mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Pull misc-for-upstream into release branch
Conflicts: drivers/usb/misc/appledisplay.c Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
81450b73dd
19 changed files with 141 additions and 170 deletions
|
|
@ -281,8 +281,8 @@ static int appledisplay_probe(struct usb_interface *iface,
|
|||
/* Register backlight device */
|
||||
snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
|
||||
atomic_inc_return(&count_displays) - 1);
|
||||
pdata->bd = backlight_device_register(bl_name, NULL,
|
||||
pdata, &appledisplay_bl_data);
|
||||
pdata->bd = backlight_device_register(bl_name, NULL, pdata,
|
||||
&appledisplay_bl_data);
|
||||
if (IS_ERR(pdata->bd)) {
|
||||
err("appledisplay: Backlight registration failed");
|
||||
goto error;
|
||||
|
|
|
|||
Loading…
Reference in a new issue