Skip to content

Commit

Permalink
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Aug 4, 2014
2 parents 19583ca + 3fc2542 commit 9afabfe
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/spi/spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
if (!ret)
ret = -ENOMEM;
if (ret < 0) {
sg_free_table(sgt);
return ret;
Expand Down Expand Up @@ -647,8 +649,8 @@ static int __spi_map_msg(struct spi_master *master, struct spi_message *msg)
if (!master->can_dma)
return 0;

tx_dev = &master->dma_tx->dev->device;
rx_dev = &master->dma_rx->dev->device;
tx_dev = master->dma_tx->device->dev;
rx_dev = master->dma_rx->device->dev;

list_for_each_entry(xfer, &msg->transfers, transfer_list) {
if (!master->can_dma(master, msg->spi, xfer))
Expand Down Expand Up @@ -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)
return 0;

tx_dev = &master->dma_tx->dev->device;
rx_dev = &master->dma_rx->dev->device;
tx_dev = master->dma_tx->device->dev;
rx_dev = master->dma_rx->device->dev;

list_for_each_entry(xfer, &msg->transfers, transfer_list) {
if (!master->can_dma(master, msg->spi, xfer))
Expand Down

0 comments on commit 9afabfe

Please sign in to comment.