diff options
| author | Tony Lindgren <[email protected]> | 2017-11-28 08:12:32 -0800 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2017-11-28 08:12:32 -0800 |
| commit | bc686442f8a601bccac1f22506ecdb4b0d62cadd (patch) | |
| tree | b224ab4aa2350b233da640f5850f48bc6bfeb2d0 /drivers/media/platform/vimc/vimc-core.c | |
| parent | 60636a5d0fa2f8bc6d0c23c4027100ba20866f9b (diff) | |
| parent | ca41e244517d6d3f1600c229ff7ca615049c1e9c (diff) | |
Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
Diffstat (limited to 'drivers/media/platform/vimc/vimc-core.c')
| -rw-r--r-- | drivers/media/platform/vimc/vimc-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c index 51c0eee61ca6..fe088a953860 100644 --- a/drivers/media/platform/vimc/vimc-core.c +++ b/drivers/media/platform/vimc/vimc-core.c @@ -267,11 +267,12 @@ static struct component_match *vimc_add_subdevs(struct vimc_device *vimc) PLATFORM_DEVID_AUTO, &pdata, sizeof(pdata)); - if (!vimc->subdevs[i]) { + if (IS_ERR(vimc->subdevs[i])) { + match = ERR_CAST(vimc->subdevs[i]); while (--i >= 0) platform_device_unregister(vimc->subdevs[i]); - return ERR_PTR(-ENOMEM); + return match; } component_match_add(&vimc->pdev.dev, &match, vimc_comp_compare, |