2 files changed, 8 insertions, 1 deletions

diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 8b060c44bbe1..65cee74605b4 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -210,6 +210,8 @@ struct arasan_cf_dev {
         struct dma_chan *dma_chan;
         /* Mask for DMA transfers */
         dma_cap_mask_t mask;
+        /* dma channel private data */
+        void *dma_priv;
         /* DMA transfer work */
         struct work_struct work;
         /* DMA delayed finish work */
@@ -356,6 +358,7 @@ static void dma_callback(void *dev)
 
 static bool filter(struct dma_chan *chan, void *slave)
 {
+        chan->private = slave;
         return true;
 }
 
@@ -526,7 +529,8 @@ static void data_xfer(struct work_struct *work)
 
         /* request dma channels */
         /* dma_request_channel may sleep, so calling from process context */
-        acdev->dma_chan = dma_request_channel(acdev->mask, filter, NULL);
+        acdev->dma_chan = dma_request_channel(acdev->mask, filter,
+                        acdev->dma_priv);
         if (!acdev->dma_chan) {
                 dev_err(acdev->host->dev, "Unable to get dma_chan\n");
                 goto chan_request_fail;
@@ -853,6 +857,7 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
         INIT_WORK(&acdev->work, data_xfer);
         INIT_DELAYED_WORK(&acdev->dwork, delayed_finish);
         dma_cap_set(DMA_MEMCPY, acdev->mask);
+        acdev->dma_priv = pdata->dma_priv;
 
         /* Handle platform specific quirks */
         if (pdata->quirk) {
diff --git a/include/linux/pata_arasan_cf_data.h b/include/linux/pata_arasan_cf_data.h
index d979fe688796..a6ee9aa898bb 100644
--- a/include/linux/pata_arasan_cf_data.h
+++ b/include/linux/pata_arasan_cf_data.h
@@ -37,6 +37,8 @@ struct arasan_cf_pdata {
         #define CF_BROKEN_PIO                   (1)
         #define CF_BROKEN_MWDMA                 (1 << 1)
         #define CF_BROKEN_UDMA                  (1 << 2)
+        /* This is platform specific data for the DMA controller */
+        void *dma_priv;
 };
 
 static inline void