From d89f356f609853bd36b458030db77ae7bf67cc5b Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Fri, 23 Mar 2012 15:02:01 -0700 Subject: [PATCH] --- yaml --- r: 295167 b: refs/heads/master c: 050ea48bbfc80b6aa81f8df0d9f25e6e47d96e98 h: refs/heads/master i: 295165: d9688790544d4d96691e6aa9c3e38d45d9b62b8e 295163: 6c7aec551a37493d0cdb802bd1ccadbd4cbf753b 295159: ecf11c65efc5d1e2e2eaedf68e25ab4f5c70403e 295151: 6145372cf2b6fbfc1cf83905a23e991e4d0d3144 295135: bf09ff03abbf8aba35d3a982f316b04248db34be 295103: 2372812e79d54a0975e7a0eab3e87c511e70a0a8 295039: 8845fad343e785e6d272f17ecaf9d810e15664f7 294911: 35f6dac3f64b3fad7bff5dbe7847545534ed4009 v: v3 --- [refs] | 2 +- trunk/drivers/video/backlight/adp5520_bl.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 960fd3349dec..03ae9a7f4ad5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce969228fdb54a7e3d7cc1ed27367fd4b9525d74 +refs/heads/master: 050ea48bbfc80b6aa81f8df0d9f25e6e47d96e98 diff --git a/trunk/drivers/video/backlight/adp5520_bl.c b/trunk/drivers/video/backlight/adp5520_bl.c index 2e630bf1164c..4911ea7989c8 100644 --- a/trunk/drivers/video/backlight/adp5520_bl.c +++ b/trunk/drivers/video/backlight/adp5520_bl.c @@ -289,7 +289,7 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) struct adp5520_bl *data; int ret = 0; - data = kzalloc(sizeof(*data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); if (data == NULL) return -ENOMEM; @@ -298,7 +298,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) if (data->pdata == NULL) { dev_err(&pdev->dev, "missing platform data\n"); - kfree(data); return -ENODEV; } @@ -314,7 +313,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) &adp5520_bl_ops, &props); if (IS_ERR(bl)) { dev_err(&pdev->dev, "failed to register backlight\n"); - kfree(data); return PTR_ERR(bl); } @@ -326,7 +324,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "failed to register sysfs\n"); backlight_device_unregister(bl); - kfree(data); } platform_set_drvdata(pdev, bl); @@ -348,7 +345,6 @@ static int __devexit adp5520_bl_remove(struct platform_device *pdev) &adp5520_bl_attr_group); backlight_device_unregister(bl); - kfree(data); return 0; }