alsactl - return error state, fail when no configuration is found

See bug#843

diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c
index 2770ee249dbb717abeb4848f3aabd2aaa08af954..07b102d2f92680c708f62c81448e5b51f8b2425a 100644 (file)
--- a/alsactl/alsactl.c
+++ b/alsactl/alsactl.c
@@ -119,5 +119,5 @@ int main(int argc, char *argv[])
                res = -ENODEV;
        }
 
-       return res < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+       return res < 0 ? res : 0;
 }

diff --git a/alsactl/state.c b/alsactl/state.c
index 3610797777655cdc1e4af76f09d996f500128922..d2cf6cf43ecc3a6bfa0e2f00323bca4a36944f20 100644 (file)
--- a/alsactl/state.c
+++ b/alsactl/state.c
@@ -1194,7 +1194,6 @@ static int set_controls(int card, snd_config_t *top)
                                id = tmpid;
                }
                if (err < 0) {
-                       err = 0;
                        fprintf(stderr, "No state is present for card %s\n", id);
                        goto _close;
                }