Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 142551
b: refs/heads/master
c: 59bfcc6
h: refs/heads/master
i:
  142549: 3f1633e
  142547: 4fdb1bf
  142543: c7f8a0b
v: v3
  • Loading branch information
Mike Frysinger authored and Linus Torvalds committed Apr 7, 2009
1 parent 766240b commit ccbc490
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 7aec35661733c651f616f9b3f69d758f6bfe2a7f
refs/heads/master: 59bfcc664859029f60269ca2bf05b310d5a5760b
4 changes: 2 additions & 2 deletions trunk/drivers/spi/spi_bfin5xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1077,13 +1077,13 @@ static int setup(struct spi_device *spi)
*/
if (chip->enable_dma && !drv_data->dma_requested) {
/* register dma irq handler */
if (request_dma(drv_data->dma_channel, "BF53x_SPI_DMA") < 0) {
if (request_dma(drv_data->dma_channel, "BFIN_SPI_DMA") < 0) {
dev_dbg(&spi->dev,
"Unable to request BlackFin SPI DMA channel\n");
return -ENODEV;
}
if (set_dma_callback(drv_data->dma_channel,
(void *)dma_irq_handler, drv_data) < 0) {
dma_irq_handler, drv_data) < 0) {
dev_dbg(&spi->dev, "Unable to set dma callback\n");
return -EPERM;
}
Expand Down

0 comments on commit ccbc490

Please sign in to comment.