From e23ee56725bb479450b7fd5ed9055ecd0497b9c6 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 5 Jul 2012 12:29:37 +0200 Subject: [PATCH] --- yaml --- r: 316666 b: refs/heads/master c: 341f4dc5dcecbf60f038055db177845b9af480ed h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/sh/shdma.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 26f5565a84dd..9a69f5205c85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fd63ccdad72335fd820b0ce5cb8edb6ca6419ce +refs/heads/master: 341f4dc5dcecbf60f038055db177845b9af480ed diff --git a/trunk/drivers/dma/sh/shdma.c b/trunk/drivers/dma/sh/shdma.c index c393b354e2b3..f06906f281ac 100644 --- a/trunk/drivers/dma/sh/shdma.c +++ b/trunk/drivers/dma/sh/shdma.c @@ -304,18 +304,18 @@ static void sh_dmae_setup_xfer(struct shdma_chan *schan, } static const struct sh_dmae_slave_config *dmae_find_slave( - struct sh_dmae_chan *sh_chan, struct sh_dmae_slave *slave) + struct sh_dmae_chan *sh_chan, unsigned int slave_id) { struct sh_dmae_device *shdev = to_sh_dev(sh_chan); struct sh_dmae_pdata *pdata = shdev->pdata; const struct sh_dmae_slave_config *cfg; int i; - if (slave->shdma_slave.slave_id >= SH_DMA_SLAVE_NUMBER) + if (slave_id >= SH_DMA_SLAVE_NUMBER) return NULL; for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++) - if (cfg->slave_id == slave->shdma_slave.slave_id) + if (cfg->slave_id == slave_id) return cfg; return NULL; @@ -328,7 +328,7 @@ static int sh_dmae_set_slave(struct shdma_chan *schan, shdma_chan); struct sh_dmae_slave *slave = container_of(sslave, struct sh_dmae_slave, shdma_slave); - const struct sh_dmae_slave_config *cfg = dmae_find_slave(sh_chan, slave); + const struct sh_dmae_slave_config *cfg = dmae_find_slave(sh_chan, sslave->slave_id); if (!cfg) return -ENODEV;