sst: log error returned by scu ipc read/write

[mv-sheeva.git] / drivers / staging / intel_sst / intelmid_pvt.c

diff --git a/drivers/staging/intel_sst/intelmid_pvt.c b/drivers/staging/intel_sst/intelmid_pvt.c
index cb71fe028333d75f2fa1bc54e77f8298df43ec06..3ba9daf675268bac500d616a0cd65940b7b490a5 100644 (file)
--- 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;
 }