diff options
| author | Len Brown | 2007-02-17 00:52:41 +0100 |
|---|---|---|
| committer | Len Brown | 2007-02-17 00:52:41 +0100 |
| commit | 81450b73dde07f473a4a7208b209b4c8b7251d90 (patch) | |
| tree | 94e676c74c32f2a74dc306cf863d7e190777f2ab /drivers/usb/misc/appledisplay.c | |
| parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
| parent | ACPI: bay: use IS_ERR for return of register_platform_device_simple (diff) | |
| download | kernel-qcow2-linux-81450b73dde07f473a4a7208b209b4c8b7251d90.tar.gz kernel-qcow2-linux-81450b73dde07f473a4a7208b209b4c8b7251d90.tar.xz kernel-qcow2-linux-81450b73dde07f473a4a7208b209b4c8b7251d90.zip | |
Pull misc-for-upstream into release branch
Conflicts:
drivers/usb/misc/appledisplay.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/usb/misc/appledisplay.c')
| -rw-r--r-- | drivers/usb/misc/appledisplay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c index 32f0e3a5b022..e573c8ba9785 100644 --- a/drivers/usb/misc/appledisplay.c +++ b/drivers/usb/misc/appledisplay.c @@ -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; |