UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'spi-5.2' into spi-5.3

This commit is contained in:
Mark Brown 2019-05-23 14:47:04 +01:00
parent 0e896f380b f3440d9a0d
commit d9424d6d48
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-bitbang.c
View File

@ -415,7 +415,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
if (ret) if (ret)
spi_master_put(master); spi_master_put(master);
return 0; return ret;
} }
EXPORT_SYMBOL_GPL(spi_bitbang_start); EXPORT_SYMBOL_GPL(spi_bitbang_start);

2
drivers/spi/spi-fsl-spi.c
View File

@ -432,7 +432,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
} }
m->status = status; m->status = status;
spi_finalize_current_message(master);
if (status || !cs_change) { if (status || !cs_change) {
ndelay(nsecs); ndelay(nsecs);
@ -440,6 +439,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
} }
fsl_spi_setup_transfer(spi, NULL); fsl_spi_setup_transfer(spi, NULL);
spi_finalize_current_message(master);
return 0; return 0;
} }

11
drivers/spi/spi.c
View File

@ -1229,10 +1229,10 @@ out:
if (msg->status && ctlr->handle_err) if (msg->status && ctlr->handle_err)
ctlr->handle_err(ctlr, msg); ctlr->handle_err(ctlr, msg);
spi_finalize_current_message(ctlr);
spi_res_release(ctlr, msg); spi_res_release(ctlr, msg);
spi_finalize_current_message(ctlr);
return ret; return ret;
} }
@ -1355,10 +1355,15 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread)
ret = ctlr->prepare_transfer_hardware(ctlr); ret = ctlr->prepare_transfer_hardware(ctlr);
if (ret) { if (ret) {
dev_err(&ctlr->dev, dev_err(&ctlr->dev,
"failed to prepare transfer hardware\n"); "failed to prepare transfer hardware: %d\n",
ret);
if (ctlr->auto_runtime_pm) if (ctlr->auto_runtime_pm)
pm_runtime_put(ctlr->dev.parent); pm_runtime_put(ctlr->dev.parent);
ctlr->cur_msg->status = ret;
spi_finalize_current_message(ctlr);
mutex_unlock(&ctlr->io_mutex); mutex_unlock(&ctlr->io_mutex);
return; return;
} }