From: Shardar Shariff Md <smohammed@nvidia.com>
To: <ldewangan@nvidia.com>, <dan.j.williams@intel.com>,
<vinod.koul@intel.com>, <swarren@wwwdotorg.org>,
<thierry.reding@gmail.com>, <gnurou@gmail.com>,
<dmaengine@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <smohammed@nvidia.com>
Subject: [PATCH] dmaengine: tegra-apb: proper default init of channel slave_id
Date: Thu, 31 Mar 2016 11:56:51 +0530 [thread overview]
Message-ID: <1459405611-12470-1-git-send-email-smohammed@nvidia.com> (raw)
Initialize default channel slave_id(req_sel) to -1 to avoid
overwriting of slave_id with client data as zero is the
valid slave_id(request_select).
Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
---
drivers/dma/tegra20-apb-dma.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 3871f29..35a0df0 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -204,7 +204,7 @@ struct tegra_dma_channel {
struct tasklet_struct tasklet;
/* Channel-slave specific configuration */
- unsigned int slave_id;
+ int slave_id;
struct dma_slave_config dma_sconfig;
struct tegra_dma_channel_regs channel_reg;
};
@@ -353,7 +353,7 @@ static int tegra_dma_slave_config(struct dma_chan *dc,
}
memcpy(&tdc->dma_sconfig, sconfig, sizeof(*sconfig));
- if (!tdc->slave_id)
+ if (tdc->slave_id == -1)
tdc->slave_id = sconfig->slave_id;
tdc->config_init = true;
return 0;
@@ -1236,7 +1236,7 @@ static void tegra_dma_free_chan_resources(struct dma_chan *dc)
}
pm_runtime_put(tdma->dev);
- tdc->slave_id = 0;
+ tdc->slave_id = -1;
}
static struct dma_chan *tegra_dma_of_xlate(struct of_phandle_args *dma_spec,
@@ -1389,6 +1389,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
&tdma->dma_dev.channels);
tdc->tdma = tdma;
tdc->id = i;
+ tdc->slave_id = -1;
tasklet_init(&tdc->tasklet, tegra_dma_tasklet,
(unsigned long)tdc);
--
1.8.1.5
next reply other threads:[~2016-03-31 6:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 6:26 Shardar Shariff Md [this message]
2016-03-31 8:34 ` Jon Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459405611-12470-1-git-send-email-smohammed@nvidia.com \
--to=smohammed@nvidia.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=gnurou@gmail.com \
--cc=ldewangan@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.com \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®