From: Andre Noll <maan@systemlinux.org>
Date: Wed, 12 May 2010 22:37:37 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.3~28
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=e90440367f744a7723b201a95888e66f070ffa92;hp=eb61cd5db32a081c0c2ff3ee9d136cdc586c16a0

Merge branch 'maint'
---

diff --git a/oss_write.c b/oss_write.c
index 10a64497..d0cff015 100644
--- 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;
 }