Merge branch 'master' into upstream.

[cascardo/linux.git] / drivers / video / bfin-lq035q1-fb.c

diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c
index c8e1f04..23b6c4b 100644 (file)
--- a/drivers/video/bfin-lq035q1-fb.c
+++ b/drivers/video/bfin-lq035q1-fb.c
@@ -154,8 +154,10 @@ static int __devinit lq035q1_spidev_probe(struct spi_device *spi)
 
        ret = lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_ON);
        ret |= lq035q1_control(spi, LQ035_DRIVER_OUTPUT_CTL, ctl->mode);
-       if (ret)
+       if (ret) {
+               kfree(ctl);
                return ret;
+       }
 
        spi_set_drvdata(spi, ctl);