From: Vinod Koul <[email protected]>

scu ipc driver fails sometimes to read/write. This add logs with register
addr and ret code when these errors occur.

Signed-off-by: Vinod Koul <[email protected]>
Signed-off-by: Alan Cox <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/intel_sst/intelmid_pvt.c |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/intel_sst/intelmid_pvt.c 
b/drivers/staging/intel_sst/intelmid_pvt.c
index cb71fe0..3ba9daf 100644
--- a/drivers/staging/intel_sst/intelmid_pvt.c
+++ b/drivers/staging/intel_sst/intelmid_pvt.c
@@ -146,30 +146,29 @@ int sst_sc_reg_access(struct sc_reg_access *sc_access,
                for (i = 0; i < num_val; i++) {
                        retval = intel_scu_ipc_iowrite8(sc_access[i].reg_addr,
                                                        sc_access[i].value);
-                       if (retval) {
-                               pr_err("IPC write failed!!! %d\n", retval);
-                               return retval;
-                       }
+                       if (retval)
+                               goto err;
                }
        } else if (type == PMIC_READ) {
                for (i = 0; i < num_val; i++) {
                        retval = intel_scu_ipc_ioread8(sc_access[i].reg_addr,
                                                        &(sc_access[i].value));
-                       if (retval) {
-                               pr_err("IPC read failed!!!!!%d\n", retval);
-                               return retval;
-                       }
+                       if (retval)
+                               goto err;
                }
        } else {
                for (i = 0; i < num_val; i++) {
                        retval = intel_scu_ipc_update_register(
                                sc_access[i].reg_addr, sc_access[i].value,
                                sc_access[i].mask);
-                       if (retval) {
-                               pr_err("IPC Modify failed!!!%d\n", retval);
-                               return retval;
-                       }
+                       if (retval)
+                               goto err;
                }
        }
-       return retval;
+       return 0;
+err:
+       pr_err("IPC failed for cmd %d, %d\n", retval, type);
+       pr_err("reg:0x%2x addr:0x%2x\n",
+               sc_access[i].reg_addr, sc_access[i].value);
+       return retval;
 }
-- 
1.7.3.2

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to