configure.in | 6 ++----

 src/alsa.c   | 6 ++++--

 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in

index ce73a49..db0920c 100644

--- a/configure.in

+++ b/configure.in

@@ -1,14 +1,12 @@

 dnl Process this file with autoconf to produce a configure script.

-AC_INIT(configure.in)

-AM_INIT_AUTOMAKE(pnmixer, 0.5.1)

-AM_CONFIG_HEADER(config.h)

+AC_INIT([pnmixer], [0.5.1])

+AM_INIT_AUTOMAKE

 AM_MAINTAINER_MODE

 OLD_CFLAGS=$CFLAGS

 AC_ISC_POSIX

 AC_PROG_CC

-AM_PROG_CC_STDC

 AC_HEADER_STDC

 CFLAGS=$OLD_CXXFLAGS

diff --git a/src/alsa.c b/src/alsa.c

index 0c2fd5c..c3da9dd 100644

--- a/src/alsa.c

+++ b/src/alsa.c

@@ -207,7 +207,8 @@ static GSList* get_channels(gchar* card) {

   snd_mixer_elem_t *telem;

   GSList *channels = NULL;

-  open_mixer(&mixer,card,NULL,0);

+  if (open_mixer(&mixer,card,NULL,0) < 0)

+	  return NULL;

   ccount = snd_mixer_get_count(mixer);

   telem = snd_mixer_first_elem(mixer);

@@ -246,7 +247,8 @@ static int alsaset() {

   card_dev = selected_card_dev(card);

   smixer_options.device = card_dev;

-  open_mixer(&handle,card_dev,&smixer_options,smixer_level);

+  if (open_mixer(&handle,card_dev,&smixer_options,smixer_level) < 0)

+    return -1;

   // set watch for volume changes

   set_io_watch(handle);