1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 8eb7460dd744..5e4654032bfa 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1307,10 +1307,15 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread)
                 ret = ctlr->prepare_transfer_hardware(ctlr);
                 if (ret) {
                         dev_err(&ctlr->dev,
-                                "failed to prepare transfer hardware\n");
+                                "failed to prepare transfer hardware: %d\n",
+                                ret);
 
                         if (ctlr->auto_runtime_pm)
                                 pm_runtime_put(ctlr->dev.parent);
+
+                        ctlr->cur_msg->status = ret;
+                        spi_finalize_current_message(ctlr);
+
                         mutex_unlock(&ctlr->io_mutex);
                         return;
                 }