diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:24:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:24:15 -0300 |
| commit | 2006ab389f819c535db3a5215d7feeaf6bceed18 (patch) | |
| tree | 6c3d6ece5b2b6ac0eab4a13e5d3b3967b28c1fc8 /linux/drivers/media/video/bt8xx/bt832.c | |
| parent | 6ae887b1a1e62f244b6c81421adab044b3056629 (diff) | |
| parent | 621b289ccfba938787bd179d47be1326f88f13a2 (diff) | |
| download | mediapointer-dvb-s2-2006ab389f819c535db3a5215d7feeaf6bceed18.tar.gz mediapointer-dvb-s2-2006ab389f819c535db3a5215d7feeaf6bceed18.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~stoth/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bt832.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bt832.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bt832.c b/linux/drivers/media/video/bt8xx/bt832.c index d4201f8eb..4eefaba8f 100644 --- a/linux/drivers/media/video/bt8xx/bt832.c +++ b/linux/drivers/media/video/bt8xx/bt832.c @@ -108,6 +108,11 @@ int bt832_init(struct i2c_client *i2c_client_s) int rc; buf=kmalloc(65,GFP_KERNEL); + if (!buf) { + v4l_err(&t->client, + "Unable to allocate memory. Detaching.\n"); + return 0; + } bt832_hexdump(i2c_client_s,buf); if(buf[0x40] != 0x31) { @@ -250,7 +255,12 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg) switch (cmd) { case BT832_HEXDUMP: { unsigned char *buf; - buf=kmalloc(65,GFP_KERNEL); + buf = kmalloc(65, GFP_KERNEL); + if (!buf) { + v4l_err(&t->client, + "Unable to allocate memory\n"); + break; + } bt832_hexdump(&t->client,buf); kfree(buf); } |