From 847c01033286d12854441912fc17065e059e3d8e Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Fri, 28 Jan 2011 21:58:54 +0300
Subject: [PATCH] --- yaml --- r: 234984 b: refs/heads/master c:
 d285e8bfe9d1a196e26b798cc04f8c5ebc60c856 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/ata/sata_dwc_460ex.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b2ca9554544a..a7cbc4c083db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c211962dc12d609effbf00a2c5c6fc38cc1dbc54
+refs/heads/master: d285e8bfe9d1a196e26b798cc04f8c5ebc60c856
diff --git a/trunk/drivers/ata/sata_dwc_460ex.c b/trunk/drivers/ata/sata_dwc_460ex.c
index 9d78f9b78f41..34fc1372d72d 100644
--- a/trunk/drivers/ata/sata_dwc_460ex.c
+++ b/trunk/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;
 }
 
 /*