aboutsummaryrefslogtreecommitdiff
path: root/sound/xen
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-05-30 13:36:55 +0300
committerTakashi Iwai <tiwai@suse.de>2018-05-30 13:19:45 +0200
commite46dcbb17d790008a12b1c18f6235d03d1dd635b (patch)
tree9913ccd2a12efa83332f225656cd6d9235152a5c /sound/xen
parent986376b68dcc95bb7df60ad30c2353c1f7578fa5 (diff)
downloadlinux-stericsson-e46dcbb17d790008a12b1c18f6235d03d1dd635b.tar.gz
ALSA: xen-front: freeing an error pointer
kfree() doesn't accept error pointers so I've set "str" to NULL on these paths. Fixes: fd3b36045c2c ("ALSA: xen-front: Read sound driver configuration from Xen store") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/xen')
-rw-r--r--sound/xen/xen_snd_front_cfg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/xen/xen_snd_front_cfg.c b/sound/xen/xen_snd_front_cfg.c
index 684b5f1d51ac..eda077c8087a 100644
--- a/sound/xen/xen_snd_front_cfg.c
+++ b/sound/xen/xen_snd_front_cfg.c
@@ -306,6 +306,7 @@ static int cfg_get_stream_type(const char *path, int index,
str = xenbus_read(XBT_NIL, stream_path, XENSND_FIELD_TYPE, NULL);
if (IS_ERR(str)) {
ret = PTR_ERR(str);
+ str = NULL;
goto fail;
}
@@ -347,6 +348,7 @@ static int cfg_stream(struct xen_snd_front_info *front_info,
str = xenbus_read(XBT_NIL, stream_path, XENSND_FIELD_TYPE, NULL);
if (IS_ERR(str)) {
ret = PTR_ERR(str);
+ str = NULL;
goto fail;
}