diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-13 12:58:24 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-13 12:58:24 +0100 |
commit | d61de7255b707f726447d3ed7459e18e0a4fab5b (patch) | |
tree | 637ead7bd04678af8c72f6acaca186891a990ffa /hw | |
parent | 2a2c4830c0068d70443f3dddc4cc668f0c601b5c (diff) | |
parent | fb7da626c0d178d687f439af2e19401f34bc901e (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20140613-1' into staging
audio: Drop superfluous conditionals around g_free()
# gpg: Signature made Fri 13 Jun 2014 12:14:24 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-audio-20140613-1:
audio: Drop superfluous conditionals around g_free()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/audio/adlib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 5dd739e541..656eb3773a 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -275,9 +275,7 @@ static void Adlib_fini (AdlibState *s) } #endif - if (s->mixbuf) { - g_free (s->mixbuf); - } + g_free(s->mixbuf); s->active = 0; s->enabled = 0; |