diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 12:41:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 12:41:12 -0400 |
| commit | 1bfd4d586057e7f608501de62bacdc82974c7cfa (patch) | |
| tree | 338e20a12e147858936de0d563dded30bddbf6f6 /drivers/video | |
| parent | 44b3615b8cb3b016a49eb7ef4236e77a77793cec (diff) | |
| parent | 1d469c6c38c9deaa1836d2c1955330944719e4ef (diff) | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
backlight: Fix tdo24m crash on kmalloc
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/backlight/tdo24m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c index 1dae7f8f3c6b..51422fc4f606 100644 --- a/drivers/video/backlight/tdo24m.c +++ b/drivers/video/backlight/tdo24m.c | |||
| @@ -356,7 +356,7 @@ static int __devinit tdo24m_probe(struct spi_device *spi) | |||
| 356 | lcd->power = FB_BLANK_POWERDOWN; | 356 | lcd->power = FB_BLANK_POWERDOWN; |
| 357 | lcd->mode = MODE_VGA; /* default to VGA */ | 357 | lcd->mode = MODE_VGA; /* default to VGA */ |
| 358 | 358 | ||
| 359 | lcd->buf = kmalloc(TDO24M_SPI_BUFF_SIZE, sizeof(GFP_KERNEL)); | 359 | lcd->buf = kmalloc(TDO24M_SPI_BUFF_SIZE, GFP_KERNEL); |
| 360 | if (lcd->buf == NULL) { | 360 | if (lcd->buf == NULL) { |
| 361 | kfree(lcd); | 361 | kfree(lcd); |
| 362 | return -ENOMEM; | 362 | return -ENOMEM; |