From 5a4a13860e5c3ca53969a826958c8bde8c4d0185 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 30 Jul 2012 14:40:33 -0700 Subject: [PATCH] --- yaml --- r: 319913 b: refs/heads/master c: f1b60d46b6f1274f1eacfc89ddbf7f6b63348196 h: refs/heads/master i: 319911: 679613b93465497ff4b499ed4532dbd646c3293c v: v3 --- [refs] | 2 +- trunk/drivers/video/backlight/ot200_bl.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c8d3c1a770dd..52f5debf76f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4be29ac6df4f7c7a0225f7f72c78f4fb10114c0 +refs/heads/master: f1b60d46b6f1274f1eacfc89ddbf7f6b63348196 diff --git a/trunk/drivers/video/backlight/ot200_bl.c b/trunk/drivers/video/backlight/ot200_bl.c index f519d55a294c..ef637ffc0799 100644 --- a/trunk/drivers/video/backlight/ot200_bl.c +++ b/trunk/drivers/video/backlight/ot200_bl.c @@ -97,10 +97,10 @@ static int ot200_backlight_probe(struct platform_device *pdev) goto error_mfgpt_alloc; } - data = kzalloc(sizeof(*data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); if (!data) { retval = -ENOMEM; - goto error_kzalloc; + goto error_devm_kzalloc; } /* setup gpio */ @@ -122,16 +122,14 @@ static int ot200_backlight_probe(struct platform_device *pdev) if (IS_ERR(bl)) { dev_err(&pdev->dev, "failed to register backlight\n"); retval = PTR_ERR(bl); - goto error_backlight_device_register; + goto error_devm_kzalloc; } platform_set_drvdata(pdev, bl); return 0; -error_backlight_device_register: - kfree(data); -error_kzalloc: +error_devm_kzalloc: cs5535_mfgpt_free_timer(pwm_timer); error_mfgpt_alloc: gpio_free(GPIO_DIMM); @@ -141,7 +139,6 @@ static int ot200_backlight_probe(struct platform_device *pdev) static int ot200_backlight_remove(struct platform_device *pdev) { struct backlight_device *bl = platform_get_drvdata(pdev); - struct ot200_backlight_data *data = bl_get_data(bl); backlight_device_unregister(bl); @@ -154,7 +151,6 @@ static int ot200_backlight_remove(struct platform_device *pdev) cs5535_mfgpt_free_timer(pwm_timer); gpio_free(GPIO_DIMM); - kfree(data); return 0; }