Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 142554
b: refs/heads/master
c: b31e27a
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger authored and Linus Torvalds committed Apr 7, 2009
1 parent 1b7ddab commit d7738bb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40a2945b97b4da9120653d84f1c3a58fe58be64c
refs/heads/master: b31e27a6dc2c6534399c595ba78390125a56e90f
6 changes: 3 additions & 3 deletions trunk/drivers/spi/spi_bfin5xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ static void pump_transfers(unsigned long data)

/* start SPI transfer */
write_CTRL(drv_data,
(cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE));
(cr | BIT_CTL_TIMOD_DMA_TX | BIT_CTL_ENABLE));

/* just return here, there can only be one transfer
* in this mode
Expand Down Expand Up @@ -827,7 +827,7 @@ static void pump_transfers(unsigned long data)

dma_config |= WNR;
dma_start_addr = (unsigned long)drv_data->rx;
cr |= CFG_SPI_DMAREAD;
cr |= BIT_CTL_TIMOD_DMA_RX | BIT_CTL_SENDOPT;

} else if (drv_data->tx != NULL) {
dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");
Expand All @@ -839,7 +839,7 @@ static void pump_transfers(unsigned long data)
drv_data->len_in_bytes));

dma_start_addr = (unsigned long)drv_data->tx;
cr |= CFG_SPI_DMAWRITE;
cr |= BIT_CTL_TIMOD_DMA_TX;

} else
BUG();
Expand Down

0 comments on commit d7738bb

Please sign in to comment.