From ccbc490a9a1d1337d0f4e3f2a0f3c896953b2fd5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 6 Apr 2009 19:00:37 -0700 Subject: [PATCH] --- yaml --- r: 142551 b: refs/heads/master c: 59bfcc664859029f60269ca2bf05b310d5a5760b h: refs/heads/master i: 142549: 3f1633ea29e8aead58f9838a116bf56959ba42f4 142547: 4fdb1bf96b37c29aaa3fdf07e421184266da1146 142543: c7f8a0b195ba1f49b92abd3c3afdc489dc810b1d v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_bfin5xx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d67db92b022c..527b45d0334a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7aec35661733c651f616f9b3f69d758f6bfe2a7f +refs/heads/master: 59bfcc664859029f60269ca2bf05b310d5a5760b diff --git a/trunk/drivers/spi/spi_bfin5xx.c b/trunk/drivers/spi/spi_bfin5xx.c index 4e45a3f7c15e..0bbe19eafc26 100644 --- a/trunk/drivers/spi/spi_bfin5xx.c +++ b/trunk/drivers/spi/spi_bfin5xx.c @@ -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; }