staging: gasket: fix gasket_wait_with_reschedule timeout return code

Return -ETIMEDOUT, not -EINVAL, on timeout, including callers.

Reported-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Zhongze Hu <frankhu@chromium.org>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gasket/apex_driver.c b/drivers/staging/gasket/apex_driver.c
index a31937dfff836a32c1c0cd3ee41cd1f601bba91f..3a83c3d4d55617e6d68cde6f7fa2f70c36af7766 100644 (file)
--- a/drivers/staging/gasket/apex_driver.c
+++ b/drivers/staging/gasket/apex_driver.c
@@ -490,7 +490,7 @@ static int apex_enter_reset(struct gasket_dev *gasket_dev, uint type)
                gasket_log_error(gasket_dev,
                                 "DMAs did not quiesce within timeout (%d ms)",
                                 APEX_RESET_RETRY * APEX_RESET_DELAY);
-               return -EINVAL;
+               return -ETIMEDOUT;
        }
 
        /*  - Enable GCB reset (0x1 to rg_rst_gcb) */
@@ -513,7 +513,7 @@ static int apex_enter_reset(struct gasket_dev *gasket_dev, uint type)
                        gasket_dev,
                        "RAM did not shut down within timeout (%d ms)",
                        APEX_RESET_RETRY * APEX_RESET_DELAY);
-               return -EINVAL;
+               return -ETIMEDOUT;
        }
 
        return 0;
@@ -562,7 +562,7 @@ static int apex_quit_reset(struct gasket_dev *gasket_dev, uint type)
                        gasket_dev,
                        "RAM did not enable within timeout (%d ms)",
                        APEX_RESET_RETRY * APEX_RESET_DELAY);
-               return -EINVAL;
+               return -ETIMEDOUT;
        }
 
        /*    - Wait for Reset complete. */
@@ -574,7 +574,7 @@ static int apex_quit_reset(struct gasket_dev *gasket_dev, uint type)
                        gasket_dev,
                        "GCB did not leave reset within timeout (%d ms)",
                        APEX_RESET_RETRY * APEX_RESET_DELAY);
-               return -EINVAL;
+               return -ETIMEDOUT;
        }
 
        if (!allow_hw_clock_gating) {

diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c
index 248d717e1df65f502c037498a5f62455f79b7fca..803566229bfcb38fc5f0cdc52a077b01c31c24b3 100644 (file)
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -2106,7 +2106,7 @@ int gasket_wait_with_reschedule(
                        "%s timeout: reg %llx timeout (%llu ms)",
                        __func__,
                        offset, max_retries * delay_ms);
-               return -EINVAL;
+               return -ETIMEDOUT;
        }
        return 0;
 }