diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-17 10:18:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-17 10:18:10 +0100 |
| commit | 50c87a99fd6b8584ab4aa6942d7d591bb50ec0a2 (patch) | |
| tree | e289299aa30f48f345f89a8f314dece85e4b48f1 | |
| parent | 03be1d73e11488028e6a168e5f98c12c0259d978 (diff) | |
| parent | a4b1ee4bd2b024425d3ff1fd1ce1ce3e6b2b3902 (diff) | |
| download | alsa-driver-build-unstable-50c87a99fd6b8584ab4aa6942d7d591bb50ec0a2.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/pci/oxygen/se6x.c | 2 | ||||
| -rw-r--r-- | alsa/utils/mod-deps.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/alsa/pci/oxygen/se6x.c b/alsa/pci/oxygen/se6x.c new file mode 100644 index 000000000..6e842d284 --- /dev/null +++ b/alsa/pci/oxygen/se6x.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/pci/oxygen/se6x.c" diff --git a/alsa/utils/mod-deps.c b/alsa/utils/mod-deps.c index b5a06aef7..6e1c3ec52 100644 --- a/alsa/utils/mod-deps.c +++ b/alsa/utils/mod-deps.c @@ -511,6 +511,8 @@ static struct cond * create_cond(char *line) if (word == NULL) nomem(); while (get_word(line, word)) { + if (*word == '#') + goto out; cond = calloc(sizeof(struct cond), 1); if (cond == NULL) nomem(); @@ -568,6 +570,8 @@ static struct cond * create_cond(char *line) if (strcmp(cond->name, "EMPTY")) find_or_create_dep(word); while (get_word(line, word)) { + if (*word == '#') + goto out; if (!strcmp(word, "&&")) cond->type = COND_AND; else if (!strcmp(word, "||")) @@ -588,6 +592,7 @@ static struct cond * create_cond(char *line) break; } } + out: free(word); return first; } |