Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / twl4030-irq.c

diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index b1dabba763cf55f5009f62cd63be7663d6fd7271..1b772ef761cbf63cf1af01a32f9d720258214669 100644 (file)
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -396,13 +396,17 @@ static int twl4030_init_sih_modules(unsigned line)
                        status = twl_i2c_read(sih->module, rxbuf,
                                sih->mask[line].isr_offset, sih->bytes_ixr);
                        if (status < 0)
-                               pr_err("twl4030: err %d initializing %s %s\n",
+                               pr_warn("twl4030: err %d initializing %s %s\n",
                                        status, sih->name, "ISR");
 
-                       if (!sih->set_cor)
+                       if (!sih->set_cor) {
                                status = twl_i2c_write(sih->module, buf,
                                        sih->mask[line].isr_offset,
                                        sih->bytes_ixr);
+                               if (status < 0)
+                                       pr_warn("twl4030: write failed: %d\n",
+                                               status);
+                       }
                        /*
                         * else COR=1 means read sufficed.
                         * (for most SIH modules...)