media: cx18: check for allocation failure in cx18_read_eeprom()

[firefly-linux-kernel-4.4.55.git] / drivers / media / pci / cx18 / cx18-driver.c

diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 13c9718a5ace32f8d1c5cf7f3125427d3bc3af93..16e89f026bca39fea89df7076851079be537ca0e 100644 (file)
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -327,13 +327,16 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
        struct i2c_client *c;
        u8 eedata[256];
 
+       memset(tv, 0, sizeof(*tv));
+
        c = kzalloc(sizeof(*c), GFP_KERNEL);
+       if (!c)
+               return;
 
        strlcpy(c->name, "cx18 tveeprom tmp", sizeof(c->name));
        c->adapter = &cx->i2c_adap[0];
        c->addr = 0xa0 >> 1;
 
-       memset(tv, 0, sizeof(*tv));
        if (tveeprom_read(c, eedata, sizeof(eedata)))
                goto ret;