aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2011-01-28 21:58:54 +0300
committerJeff Garzik <jgarzik@redhat.com>2011-03-02 02:36:46 -0500
commitd285e8bfe9d1a196e26b798cc04f8c5ebc60c856 (patch)
treea2dfdb19e453aef890fc83a59cc104e0636cbfdf
parentc211962dc12d609effbf00a2c5c6fc38cc1dbc54 (diff)
downloadkernel_samsung_aries-d285e8bfe9d1a196e26b798cc04f8c5ebc60c856.zip
kernel_samsung_aries-d285e8bfe9d1a196e26b798cc04f8c5ebc60c856.tar.gz
kernel_samsung_aries-d285e8bfe9d1a196e26b798cc04f8c5ebc60c856.tar.bz2
sata_dwc_460ex: fix return value of dma_dwc_xfer_setup()
The caller expects this function to return the DMA channel number on success, while it returns 0... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/ata/sata_dwc_460ex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 9d78f9b..34fc137 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -44,7 +44,7 @@
#undef DRV_NAME
#undef DRV_VERSION
#define DRV_NAME "sata-dwc"
-#define DRV_VERSION "1.1"
+#define DRV_VERSION "1.2"
/* SATA DMA driver Globals */
#define DMA_NUM_CHANS 1
@@ -718,7 +718,7 @@ static int dma_dwc_xfer_setup(struct scatterlist *sg, int num_elems,
/* Program the CTL register with src enable / dst enable */
out_le32(&(host_pvt.sata_dma_regs->chan_regs[dma_ch].ctl.low),
DMA_CTL_LLP_SRCEN | DMA_CTL_LLP_DSTEN);
- return 0;
+ return dma_ch;
}
/*