diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:37 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:37 +0200 |
| commit | 8c3ff3a7fb9730564554bb65d54455e6ce8ad340 (patch) | |
| tree | e21bbdab8537678b85f9661ceb89f09989a9935b /sound/mips/sgio2audio.c | |
| parent | ed8cc176c9d3f8fbc2ddc18b75362be666e6d328 (diff) | |
| parent | ad0b0822f98ef547e2461ce463e4233bad7848a8 (diff) | |
Merge branch 'topic/misc' into for-linus
* topic/misc:
ALSA: sgio2audio.c: clean up checking
ALSA: burgundy: timeout message is off by one.
ALSA: bt87x - Add a quirk entry for Askey Computer Corp. MagicTView'99
ALSA: parisc/harmony: fix printk format warning
ALSA: keywest: Get rid of useless i2c_device_name() macro
Diffstat (limited to 'sound/mips/sgio2audio.c')
| -rw-r--r-- | sound/mips/sgio2audio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 66f3b48ceaf..e497525bc11 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c @@ -619,8 +619,7 @@ static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream, /* hw_free callback */ static int snd_sgio2audio_pcm_hw_free(struct snd_pcm_substream *substream) { - if (substream->runtime->dma_area) - vfree(substream->runtime->dma_area); + vfree(substream->runtime->dma_area); substream->runtime->dma_area = NULL; return 0; } |