From 1989b3cbe313759b602ead253c5ad08578a72d45 Mon Sep 17 00:00:00 2001
From: "Mark A. Greer" <mgreer@animalcreek.com>
Date: Fri, 21 Dec 2012 10:04:07 -0700
Subject: [PATCH] --- yaml --- r: 357711 b: refs/heads/master c:
 0e87e73f4abe1ada69cf780fe2550c6361a1b53b h: refs/heads/master i:   357709:
 0bd1a62ab755aecec70b2da8c104fb323cc56a82   357707:
 2913307da89e2a452c106906b565156476733d0c   357703:
 7d61405b03d6d3169f199190b696607b0ce94c8d   357695:
 6ac90d6dc5634ab09ce2fc5b061e6602d404aa3d v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/crypto/omap-sham.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 22888375bbbf..99b9838a2f1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03feec9cc67eaa21e9aa0d3aede0dfed0629f468
+refs/heads/master: 0e87e73f4abe1ada69cf780fe2550c6361a1b53b
diff --git a/trunk/drivers/crypto/omap-sham.c b/trunk/drivers/crypto/omap-sham.c
index 860cad866a36..8074bd9947d1 100644
--- a/trunk/drivers/crypto/omap-sham.c
+++ b/trunk/drivers/crypto/omap-sham.c
@@ -1292,7 +1292,8 @@ static int __devinit omap_sham_probe(struct platform_device *pdev)
 	dma_cap_zero(mask);
 	dma_cap_set(DMA_SLAVE, mask);
 
-	dd->dma_lch = dma_request_channel(mask, omap_dma_filter_fn, &dd->dma);
+	dd->dma_lch = dma_request_slave_channel_compat(mask, omap_dma_filter_fn,
+						       &dd->dma, dev, "rx");
 	if (!dd->dma_lch) {
 		dev_err(dev, "unable to obtain RX DMA engine channel %u\n",
 			dd->dma);