aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 6046dcd7487e..939edf473235 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1172,7 +1172,6 @@ static int spi_master_initialize_queue(struct spi_master *master)
1172{ 1172{
1173 int ret; 1173 int ret;
1174 1174
1175 master->queued = true;
1176 master->transfer = spi_queued_transfer; 1175 master->transfer = spi_queued_transfer;
1177 if (!master->transfer_one_message) 1176 if (!master->transfer_one_message)
1178 master->transfer_one_message = spi_transfer_one_message; 1177 master->transfer_one_message = spi_transfer_one_message;
@@ -1183,6 +1182,7 @@ static int spi_master_initialize_queue(struct spi_master *master)
1183 dev_err(&master->dev, "problem initializing queue\n"); 1182 dev_err(&master->dev, "problem initializing queue\n");
1184 goto err_init_queue; 1183 goto err_init_queue;
1185 } 1184 }
1185 master->queued = true;
1186 ret = spi_start_queue(master); 1186 ret = spi_start_queue(master);
1187 if (ret) { 1187 if (ret) {
1188 dev_err(&master->dev, "problem starting queue\n"); 1188 dev_err(&master->dev, "problem starting queue\n");
@@ -1192,8 +1192,8 @@ static int spi_master_initialize_queue(struct spi_master *master)
1192 return 0; 1192 return 0;
1193 1193
1194err_start_queue: 1194err_start_queue:
1195err_init_queue:
1196 spi_destroy_queue(master); 1195 spi_destroy_queue(master);
1196err_init_queue:
1197 return ret; 1197 return ret;
1198} 1198}
1199 1199