Merge branch 'pxa' into devel

[linux-2.6] / drivers / video / backlight / pwm_bl.c

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 8346dfc01cf695266a39872c7999f7ec7bd387c7..6338d0e2fe0794f100e4d55c37dcb847dcf646c6 100644 (file)
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -87,9 +87,9 @@ static int pwm_backlight_probe(struct platform_device *pdev)
        pb->notify = data->notify;
 
        pb->pwm = pwm_request(data->pwm_id, "backlight");
-       if (pb->pwm == NULL) {
+       if (IS_ERR(pb->pwm)) {
                dev_err(&pdev->dev, "unable to request PWM for backlight\n");
-               ret = -EBUSY;
+               ret = PTR_ERR(pb->pwm);
                goto err_pwm;
        }