Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatchin...

[linux.git] / drivers / uio / uio_dmem_genirq.c

diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
index f32cef94aa82a98926fed44e60d85a2e7b8bf8d3..ebcf1434e296df43c753286c496df8150921d6ff 100644 (file)
--- a/drivers/uio/uio_dmem_genirq.c
+++ b/drivers/uio/uio_dmem_genirq.c
@@ -200,10 +200,8 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
 
        if (!uioinfo->irq) {
                ret = platform_get_irq(pdev, 0);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "failed to get IRQ\n");
+               if (ret < 0)
                        goto bad1;
-               }
                uioinfo->irq = ret;
        }
        uiomem = &uioinfo->mem[0];