V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.

[linux-2.6-omap-h63xx.git] / drivers / media / video / bt8xx / bt832.c

diff --git a/drivers/media/video/bt8xx/bt832.c b/drivers/media/video/bt8xx/bt832.c
index a51876137880b26babbd24b6ae153aa6d2f9fad1..f92f06dec0d0a2fce3c09965e5e1b8570ca34acd 100644 (file)
--- a/drivers/media/video/bt8xx/bt832.c
+++ b/drivers/media/video/bt8xx/bt832.c
@@ -97,6 +97,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) {
@@ -211,7 +216,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);
                }