evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Brown 2014-08-04 17:20:53 +01:00
commit 9afabfe3f8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/spi/spi.c
View file

@ -619,6 +619,8 @@ static int spi_map_buf(struct spi_master *master, struct device *dev,
} }
ret = dma_map_sg(dev, sgt->sgl, sgt->nents, dir); ret = dma_map_sg(dev, sgt->sgl, sgt->nents, dir);
if (!ret)
ret = -ENOMEM;
if (ret < 0) { if (ret < 0) {
sg_free_table(sgt); sg_free_table(sgt);
return ret; return ret;
@ -647,8 +649,8 @@ static int __spi_map_msg(struct spi_master *master, struct spi_message *msg)
if (!master->can_dma) if (!master->can_dma)
return 0; return 0;
tx_dev = &master->dma_tx->dev->device; tx_dev = master->dma_tx->device->dev;
rx_dev = &master->dma_rx->dev->device; rx_dev = master->dma_rx->device->dev;
list_for_each_entry(xfer, &msg->transfers, transfer_list) { list_for_each_entry(xfer, &msg->transfers, transfer_list) {
if (!master->can_dma(master, msg->spi, xfer)) if (!master->can_dma(master, msg->spi, xfer))
@ -687,8 +689,8 @@ static int spi_unmap_msg(struct spi_master *master, struct spi_message *msg)
if (!master->cur_msg_mapped || !master->can_dma) if (!master->cur_msg_mapped || !master->can_dma)
return 0; return 0;
tx_dev = &master->dma_tx->dev->device; tx_dev = master->dma_tx->device->dev;
rx_dev = &master->dma_rx->dev->device; rx_dev = master->dma_rx->device->dev;
list_for_each_entry(xfer, &msg->transfers, transfer_list) { list_for_each_entry(xfer, &msg->transfers, transfer_list) {
if (!master->can_dma(master, msg->spi, xfer)) if (!master->can_dma(master, msg->spi, xfer))