mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
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
This commit is contained in:
commit
1bfd4d5860
1 changed files with 1 additions and 1 deletions
|
@ -356,7 +356,7 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
|
||||||
lcd->power = FB_BLANK_POWERDOWN;
|
lcd->power = FB_BLANK_POWERDOWN;
|
||||||
lcd->mode = MODE_VGA; /* default to VGA */
|
lcd->mode = MODE_VGA; /* default to VGA */
|
||||||
|
|
||||||
lcd->buf = kmalloc(TDO24M_SPI_BUFF_SIZE, sizeof(GFP_KERNEL));
|
lcd->buf = kmalloc(TDO24M_SPI_BUFF_SIZE, GFP_KERNEL);
|
||||||
if (lcd->buf == NULL) {
|
if (lcd->buf == NULL) {
|
||||||
kfree(lcd);
|
kfree(lcd);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
Loading…
Reference in a new issue