staging: gasket: bail out of reset sequence on device callback error

If device reset callback returns an error, error out at the gasket
level.

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/gasket_core.c b/drivers/staging/gasket/gasket_core.c
index 94e64b900380df0a6906987ed4c205bbd6a6abc1..bc3662eafb63d86be451f797133418d2a93bef96 100644 (file)
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -1875,9 +1875,11 @@ int gasket_reset_nolock(struct gasket_dev *gasket_dev, uint reset_type)
 
        /* Perform a device reset of the requested type. */
        ret = driver_desc->device_reset_cb(gasket_dev, reset_type);
-       if (ret)
+       if (ret) {
                gasket_log_error(
                        gasket_dev, "Device reset cb returned %d.", ret);
+               return ret;
+       }
 
        /* Reinitialize the page tables and interrupt framework. */
        for (i = 0; i < driver_desc->num_page_tables; ++i)