diff options
| author | Mark Brown <broonie@kernel.org> | 2017-02-19 16:40:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-02-19 16:40:55 +0000 |
| commit | 3490462378944c7e137657d0d66bb707303cfc96 (patch) | |
| tree | ed0a745abd1c44b02629c8aaa8943ef88f7300f9 /drivers/spi/spi.c | |
| parent | 42af2f5c52daec0c182af66984927ef64885bbcc (diff) | |
| parent | 1ce24864bff40e11500a699789412115fdf244bf (diff) | |
| download | op-kernel-dev-3490462378944c7e137657d0d66bb707303cfc96.zip op-kernel-dev-3490462378944c7e137657d0d66bb707303cfc96.tar.gz | |
Merge remote-tracking branch 'spi/topic/dma' into spi-next
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 59cb2647..e709553 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -807,12 +807,12 @@ static int __spi_map_msg(struct spi_master *master, struct spi_message *msg) if (master->dma_tx) tx_dev = master->dma_tx->device->dev; else - tx_dev = &master->dev; + tx_dev = master->dev.parent; if (master->dma_rx) rx_dev = master->dma_rx->device->dev; else - rx_dev = &master->dev; + rx_dev = master->dev.parent; list_for_each_entry(xfer, &msg->transfers, transfer_list) { if (!master->can_dma(master, msg->spi, xfer)) @@ -854,12 +854,12 @@ static int __spi_unmap_msg(struct spi_master *master, struct spi_message *msg) if (master->dma_tx) tx_dev = master->dma_tx->device->dev; else - tx_dev = &master->dev; + tx_dev = master->dev.parent; if (master->dma_rx) rx_dev = master->dma_rx->device->dev; else - rx_dev = &master->dev; + rx_dev = master->dev.parent; list_for_each_entry(xfer, &msg->transfers, transfer_list) { if (!master->can_dma(master, msg->spi, xfer)) |
