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/backlight.c | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/backlight/backlight.c')
| -rw-r--r-- | drivers/video/backlight/backlight.c | 2 |
1 files changed, 1 insertions, 1 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; |