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

[linux.git] / drivers / clocksource / em_sti.c

diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
index 8e12b11e81b096b77c8bcc6c9eca0cc0a3c5c240..9039df4f90e2bd6caa58ee6848c8a48ebec7d365 100644 (file)
--- a/drivers/clocksource/em_sti.c
+++ b/drivers/clocksource/em_sti.c
@@ -291,10 +291,8 @@ static int em_sti_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, p);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get irq\n");
+       if (irq < 0)
                return irq;
-       }
 
        /* map memory, let base point to the STI instance */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);