diff options
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
commit | fa41d6ee904266fa8739cafa6ec038c3a8e435b7 (patch) | |
tree | 4d5439bafd38dc730838bb15e6a49e747793d4a7 /drivers/iio/adc/npcm_adc.c | |
parent | 9cd20ef7803cc53a00c6eb7198b3d870ac7b3766 (diff) | |
parent | 7ed093602e0e1b60a0fc074a9692687e7d2b723d (diff) | |
download | linux-fa41d6ee904266fa8739cafa6ec038c3a8e435b7.tar.xz |
Merge drm/drm-next into drm-intel-next-queued
Backmerging to pull in HDR DP code:
https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.html
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/iio/adc/npcm_adc.c')
-rw-r--r-- | drivers/iio/adc/npcm_adc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/iio/adc/npcm_adc.c b/drivers/iio/adc/npcm_adc.c index 193b3b81de4d..910f3585fa54 100644 --- a/drivers/iio/adc/npcm_adc.c +++ b/drivers/iio/adc/npcm_adc.c @@ -225,7 +225,6 @@ static int npcm_adc_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq <= 0) { - dev_err(dev, "failed getting interrupt resource\n"); ret = -EINVAL; goto err_disable_clk; } |