diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-04 08:04:08 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-05 15:55:52 +0200 |
| commit | 8dc0a56529f5d60bbb927049d48245b1a7989bf8 (patch) | |
| tree | bf1a12dcae17094441e2b4d9a550e212d0d82006 /drivers/video | |
| parent | ASoC: omap-hdmi-audio: Fix invalid combination of DM_INH and CA (diff) | |
| parent | arm/dts: am57xx-beagle-x15.dts: add HDMI (diff) | |
| download | linux-8dc0a56529f5d60bbb927049d48245b1a7989bf8.tar.xz linux-8dc0a56529f5d60bbb927049d48245b1a7989bf8.zip | |
Merge branch 'ti-dra7-dss' into 4.2/fbdev
Merge arch/ changes for TI's DRA7 SoC Display Subsystem.
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/backlight/pwm_bl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 3a145a643e0d..6897f1c1bc73 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -274,6 +274,10 @@ static int pwm_backlight_probe(struct platform_device *pdev) pb->pwm = devm_pwm_get(&pdev->dev, NULL); if (IS_ERR(pb->pwm)) { + ret = PTR_ERR(pb->pwm); + if (ret == -EPROBE_DEFER) + goto err_alloc; + dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); pb->legacy = true; pb->pwm = pwm_request(data->pwm_id, "pwm-backlight"); |