summaryrefslogtreecommitdiffstats
path: root/drivers/video/backlight/da903x.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-12-03 20:11:06 +1100
committerPaul Mackerras <paulus@samba.org>2008-12-03 20:11:06 +1100
commit527491885554002837b5742202adc0ab5f536e54 (patch)
tree6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /drivers/video/backlight/da903x.c
parentcea555d384b85271035814c5adad23e6c7fc5d2a (diff)
parent2434bbb30e79468c49cff3cff6005236f55ed188 (diff)
downloadlinux-527491885554002837b5742202adc0ab5f536e54.tar.bz2
Merge branch 'merge'
Diffstat (limited to 'drivers/video/backlight/da903x.c')
-rw-r--r--drivers/video/backlight/da903x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/backlight/da903x.c b/drivers/video/backlight/da903x.c
index 242c38250166..93bb4340cc64 100644
--- a/drivers/video/backlight/da903x.c
+++ b/drivers/video/backlight/da903x.c
@@ -119,6 +119,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
default:
dev_err(&pdev->dev, "invalid backlight device ID(%d)\n",
pdev->id);
+ kfree(data);
return -EINVAL;
}
@@ -130,6 +131,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
data, &da903x_backlight_ops);
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n");
+ kfree(data);
return PTR_ERR(bl);
}