Explorar o código

Merge remote-tracking branch 'spi/fix/core' into spi-linus

Mark Brown %!s(int64=11) %!d(string=hai) anos
pai
achega
797d0dec8a
Modificáronse 1 ficheiros con 1 adicións e 3 borrados
  1. 1 3
      drivers/spi/spi.c

+ 1 - 3
drivers/spi/spi.c

@@ -755,9 +755,7 @@ static void spi_pump_messages(struct kthread_work *work)
 	ret = master->transfer_one_message(master, master->cur_msg);
 	ret = master->transfer_one_message(master, master->cur_msg);
 	if (ret) {
 	if (ret) {
 		dev_err(&master->dev,
 		dev_err(&master->dev,
-			"failed to transfer one message from queue: %d\n", ret);
-		master->cur_msg->status = ret;
-		spi_finalize_current_message(master);
+			"failed to transfer one message from queue\n");
 		return;
 		return;
 	}
 	}
 }
 }