---

yaml --- r: 273867 b: refs/heads/master c: 16ca810 h: refs/heads/master i: 273865: dfcb1d6 273863: c13e7f6 v: v3
git-mirror · Aug 25, 2011 · b557380 · b557380
1 parent 77e2b70
commit b557380
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48a59ef3579492855d41405f8bf0a2983e061976
+refs/heads/master: 16ca8105040217acf5b4b506d04bb933fb3a76af
diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c
@@ -916,7 +916,7 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan,
 	 * need, but for slaves the physical signals may be muxed!
 	 * Can the platform allow us to use this channel?
 	 */
-	if (plchan->slave && ch->signal < 0 && pl08x->pd->get_signal) {
+	if (plchan->slave && pl08x->pd->get_signal) {
 		ret = pl08x->pd->get_signal(plchan);
 		if (ret < 0) {
 			dev_dbg(&pl08x->adev->dev,