From b5573808e5a6e93b10279e2108a576b20856b21b Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Fri, 5 Aug 2011 15:32:35 +0530 Subject: [PATCH] --- yaml --- r: 273867 b: refs/heads/master c: 16ca8105040217acf5b4b506d04bb933fb3a76af h: refs/heads/master i: 273865: dfcb1d6503efdc093fb10bfc496c3a32898fad74 273863: c13e7f6ce4da46c07b58bb09dcc6b1061e4e1b5a v: v3 --- [refs] | 2 +- trunk/drivers/dma/amba-pl08x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6275da73e19a..5b1e6cf04933 100644 --- 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 index d79688d64886..3653961b6088 100644 --- 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,