diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-12-11 11:20:50 -0700 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-11 22:45:36 +0000 |
commit | e9036c2a60f368b8ddc349fbbcde918ed32ab597 (patch) | |
tree | 2e9eb35bb4708d028dbca5b8720736ee5ee17afe /sound/soc/soc-generic-dmaengine-pcm.c | |
parent | 5eda87b890f867b098e5566b5543642851e8b9c3 (diff) | |
download | linux-e9036c2a60f368b8ddc349fbbcde918ed32ab597.tar.gz linux-e9036c2a60f368b8ddc349fbbcde918ed32ab597.tar.bz2 linux-e9036c2a60f368b8ddc349fbbcde918ed32ab597.zip |
ASoC: dmaengine: fix deferred probe detection
Check the return value of dma_request_slave_channel_reason() to see if
deferred probe happens, not the variable the return value will be
assigned to later.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Fixes: 5eda87b890f8 ("ASoC: dmaengine: support deferred probe for DMA channels")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-generic-dmaengine-pcm.c')
-rw-r--r-- | sound/soc/soc-generic-dmaengine-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 585eaa69e8c3..7483922f6ee3 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -321,7 +321,7 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm, name = config->chan_names[i]; chan = dma_request_slave_channel_reason(dev, name); if (IS_ERR(chan)) { - if (PTR_ERR(pcm->chan[i]) == -EPROBE_DEFER) + if (PTR_ERR(chan) == -EPROBE_DEFER) return -EPROBE_DEFER; pcm->chan[i] = NULL; } else { |