lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull misc-for-upstream into release branch

Browse Source 
Conflicts:

	drivers/usb/misc/appledisplay.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2007-02-16 18:52:41 -05:00
parent 8a03d9a498 0539771d72
commit 81450b73dd
19 changed files with 141 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/misc/appledisplay.c
View File

@@ -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;