diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-03-01 10:14:24 +0100 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-03-01 10:14:24 +0100 |
| commit | bba73071b6f71be0a101658d7c13866e30b264a6 (patch) | |
| tree | 2a0ea1fc5fd975f1c2e9e50de5bb3cb2cb3cb5f7 /drivers/media/platform/coda/imx-vdoa.c | |
| parent | drm/i915/dp: Add HBR3 rate (8.1 Gbps) to dp_rates array (diff) | |
| parent | Merge tag 'drm-intel-next-2018-02-21' of git://anongit.freedesktop.org/drm/dr... (diff) | |
| download | linux-bba73071b6f71be0a101658d7c13866e30b264a6.tar.xz linux-bba73071b6f71be0a101658d7c13866e30b264a6.zip | |
Merge drm-next into drm-intel-next-queued (this time for real)
To pull in the HDCP changes, especially wait_for changes to drm/i915
that Chris wants to build on top of.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/media/platform/coda/imx-vdoa.c')
| -rw-r--r-- | drivers/media/platform/coda/imx-vdoa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/coda/imx-vdoa.c b/drivers/media/platform/coda/imx-vdoa.c index 8eb3e0c05473..85a66e4e2f9a 100644 --- a/drivers/media/platform/coda/imx-vdoa.c +++ b/drivers/media/platform/coda/imx-vdoa.c @@ -86,7 +86,6 @@ struct vdoa_data { struct device *dev; struct clk *vdoa_clk; void __iomem *regs; - int irq; }; struct vdoa_q_data { @@ -293,6 +292,7 @@ static int vdoa_probe(struct platform_device *pdev) { struct vdoa_data *vdoa; struct resource *res; + int ret; dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); @@ -316,12 +316,12 @@ static int vdoa_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) return -EINVAL; - vdoa->irq = devm_request_threaded_irq(&pdev->dev, res->start, NULL, + ret = devm_request_threaded_irq(&pdev->dev, res->start, NULL, vdoa_irq_handler, IRQF_ONESHOT, "vdoa", vdoa); - if (vdoa->irq < 0) { + if (ret < 0) { dev_err(vdoa->dev, "Failed to get irq\n"); - return vdoa->irq; + return ret; } platform_set_drvdata(pdev, vdoa); |