summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-09 17:52:13 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-09 17:52:13 +0000
commited01e1adb52c804bc43a4ba7b5a7060071a60030 (patch)
tree33da9461a9bdb1e7b121d6a846e2f4331180e712 /src
parenteaddc0195cf12fa76430d843026188dda6d27aaf (diff)
don't hit an assert when we cannot resume a device
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1599 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rw-r--r--src/modules/module-alsa-sink.c6
-rw-r--r--src/modules/module-alsa-source.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 708dd1f4..1a69954c 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -337,8 +337,10 @@ static int unsuspend(struct userdata *u) {
return 0;
fail:
- snd_pcm_close(u->pcm_handle);
- u->pcm_handle = NULL;
+ if (u->pcm_handle) {
+ snd_pcm_close(u->pcm_handle);
+ u->pcm_handle = NULL;
+ }
return -1;
}
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 61035c76..553d0283 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -325,8 +325,10 @@ static int unsuspend(struct userdata *u) {
return 0;
fail:
- snd_pcm_close(u->pcm_handle);
- u->pcm_handle = NULL;
+ if (u->pcm_handle) {
+ snd_pcm_close(u->pcm_handle);
+ u->pcm_handle = NULL;
+ }
return -1;
}