Merge branch 'maint'

diff --git a/oss_write.c b/oss_write.c
index 10a64497d58b9c024aa9d1097bd7976da3b79883..d0cff0150bf9c7690ffe2eb37f0a55b46d142c00 100644 (file)
--- a/oss_write.c
+++ b/oss_write.c
@@ -53,7 +53,8 @@ static void oss_close(struct writer_node *wn)
 {
        struct private_oss_write_data *powd = wn->private_data;
 
-       close(powd->fd);
+       if (powd->fd >= 0)
+               close(powd->fd);
        free(powd);
 }
 
@@ -137,7 +138,7 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
        return 1;
 err:
        close(powd->fd);
-       free(powd);
+       powd->fd = -1;
        return ret;
 }