diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/video/backlight | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/backlight')
| -rw-r--r-- | drivers/video/backlight/backlight.c | 2 | ||||
| -rw-r--r-- | drivers/video/backlight/lcd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index bd39bbd88d41..151fda8dded0 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c | |||
| @@ -172,7 +172,7 @@ struct backlight_device *backlight_device_register(const char *name, void *devda | |||
| 172 | 172 | ||
| 173 | new_bd = kmalloc(sizeof(struct backlight_device), GFP_KERNEL); | 173 | new_bd = kmalloc(sizeof(struct backlight_device), GFP_KERNEL); |
| 174 | if (unlikely(!new_bd)) | 174 | if (unlikely(!new_bd)) |
| 175 | return ERR_PTR(ENOMEM); | 175 | return ERR_PTR(-ENOMEM); |
| 176 | 176 | ||
| 177 | init_MUTEX(&new_bd->sem); | 177 | init_MUTEX(&new_bd->sem); |
| 178 | new_bd->props = bp; | 178 | new_bd->props = bp; |
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c index 9e32485ee7bb..86908a60c630 100644 --- a/drivers/video/backlight/lcd.c +++ b/drivers/video/backlight/lcd.c | |||
| @@ -171,7 +171,7 @@ struct lcd_device *lcd_device_register(const char *name, void *devdata, | |||
| 171 | 171 | ||
| 172 | new_ld = kmalloc(sizeof(struct lcd_device), GFP_KERNEL); | 172 | new_ld = kmalloc(sizeof(struct lcd_device), GFP_KERNEL); |
| 173 | if (unlikely(!new_ld)) | 173 | if (unlikely(!new_ld)) |
| 174 | return ERR_PTR(ENOMEM); | 174 | return ERR_PTR(-ENOMEM); |
| 175 | 175 | ||
| 176 | init_MUTEX(&new_ld->sem); | 176 | init_MUTEX(&new_ld->sem); |
| 177 | new_ld->props = lp; | 177 | new_ld->props = lp; |