diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 02:31:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 02:31:36 +0200 |
| commit | 7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5 (patch) | |
| tree | 08b949c872aefbc0f8e12bdcc4dc82297bdd0f2e /sound/soc/spear/spear_pcm.c | |
| parent | serial: mxs-auart: put the device in the error path (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | linux-7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5.tar.xz linux-7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5.zip | |
Merge 3.6-rc6 into tty-next
This pulls in the fixes in 3.6-rc6
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/spear/spear_pcm.c')
| -rw-r--r-- | sound/soc/spear/spear_pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c index 97c2cac8e92c..8c7f23729446 100644 --- a/sound/soc/spear/spear_pcm.c +++ b/sound/soc/spear/spear_pcm.c @@ -138,7 +138,7 @@ static void spear_pcm_free(struct snd_pcm *pcm) continue; buf = &substream->dma_buffer; - if (!buf && !buf->area) + if (!buf || !buf->area) continue; dma_free_writecombine(pcm->card->dev, buf->bytes, |