summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-29 09:41:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-29 09:41:12 -0700
commit1bfd4d586057e7f608501de62bacdc82974c7cfa (patch)
tree338e20a12e147858936de0d563dded30bddbf6f6 /drivers/video
parent44b3615b8cb3b016a49eb7ef4236e77a77793cec (diff)
parent1d469c6c38c9deaa1836d2c1955330944719e4ef (diff)
downloadop-kernel-dev-1bfd4d586057e7f608501de62bacdc82974c7cfa.zip
op-kernel-dev-1bfd4d586057e7f608501de62bacdc82974c7cfa.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index 1dae7f8..51422fc 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)
lcd->power = FB_BLANK_POWERDOWN;
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) {
kfree(lcd);
return -ENOMEM;
OpenPOWER on IntegriCloud