diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
| commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
| tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /drivers/video/backlight/lcd.c | |
| parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
| parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/backlight/lcd.c')
| -rw-r--r-- | drivers/video/backlight/lcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |