diff options
author | Mark Brown <broonie@kernel.org> | 2017-08-25 14:44:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-08-25 14:44:05 +0100 |
commit | b7e2672d1a23a53bd2657704bf94a8dc8880cc49 (patch) | |
tree | 7e315f84913b6cd896fda558724961b39a735587 /drivers/gpu/drm/imx/parallel-display.c | |
parent | c0d1cb8366bab9963822c27b0d40cb8b32928cdc (diff) | |
parent | 9ce76511b67be8fbcdff36b7e1662e3887bb7377 (diff) | |
download | linux-b7e2672d1a23a53bd2657704bf94a8dc8880cc49.tar.gz linux-b7e2672d1a23a53bd2657704bf94a8dc8880cc49.tar.xz |
Merge tag 'sound-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-rt5677
sound fixes for 4.13-rc7
We're keeping in a good shape, this batch contains just a few small
fixes (a regression fix for ASoC rt5677 codec, NULL dereference and
error-path fixes in firewire, and a corner-case ioctl error fix for
user TLV), as well as usual quirks for USB-audio and HD-audio.
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
-rw-r--r-- | drivers/gpu/drm/imx/parallel-display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index 636031a30e17..8aca20209cb8 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -237,7 +237,7 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) /* port@1 is the output port */ ret = drm_of_find_panel_or_bridge(np, 1, 0, &imxpd->panel, &imxpd->bridge); - if (ret) + if (ret && ret != -ENODEV) return ret; imxpd->dev = dev; |