2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/hsi/controllers/omap_ssi.c b/drivers/hsi/controllers/omap_ssi.c
index 0fc7a7fd0140..232ab7340b76 100644
--- a/drivers/hsi/controllers/omap_ssi.c
+++ b/drivers/hsi/controllers/omap_ssi.c
@@ -353,12 +353,12 @@ static int __init ssi_add_controller(struct hsi_controller *ssi,
         err = ssi_get_iomem(pd, "gdd", &omap_ssi->gdd, NULL);
         if (err < 0)
                 goto out_err;
-        omap_ssi->gdd_irq = platform_get_irq_byname(pd, "gdd_mpu");
-        if (omap_ssi->gdd_irq < 0) {
+        err = platform_get_irq_byname(pd, "gdd_mpu");
+        if (err < 0) {
                 dev_err(&pd->dev, "GDD IRQ resource missing\n");
-                err = omap_ssi->gdd_irq;
                 goto out_err;
         }
+        omap_ssi->gdd_irq = err;
         tasklet_init(&omap_ssi->gdd_tasklet, ssi_gdd_tasklet,
                                                         (unsigned long)ssi);
         err = devm_request_irq(&ssi->device, omap_ssi->gdd_irq, ssi_gdd_isr,
diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
index 29aea0b93360..001b86820616 100644
--- a/drivers/hsi/controllers/omap_ssi_port.c
+++ b/drivers/hsi/controllers/omap_ssi_port.c
@@ -1013,11 +1013,12 @@ static int __init ssi_port_irq(struct hsi_port *port,
         struct omap_ssi_port *omap_port = hsi_port_drvdata(port);
         int err;
 
-        omap_port->irq = platform_get_irq(pd, 0);
-        if (omap_port->irq < 0) {
+        err = platform_get_irq(pd, 0);
+        if (err < 0) {
                 dev_err(&port->device, "Port IRQ resource missing\n");
-                return omap_port->irq;
+                return err;
         }
+        omap_port->irq = err;
         tasklet_init(&omap_port->pio_tasklet, ssi_pio_tasklet,
                                                         (unsigned long)port);
         err = devm_request_irq(&port->device, omap_port->irq, ssi_pio_isr,