| Message ID | 1401174756-10729-1-git-send-email-david.henningsson@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Takashi Iwai |
| Headers | show |
At Tue, 27 May 2014 09:12:36 +0200, David Henningsson wrote: > > On a 3.15 based kernel, both "hdaudioC*D*" and "hwC*D*" shows up under > /sys/class/sound, and pointing to the same object. Make sure we only > match on the hwC*D* name to avoid duplicate entries. > > Signed-off-by: David Henningsson <david.henningsson@canonical.com> Thanks, applied. Takashi > --- > hdajackretask/sysfs-pin-configs.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hdajackretask/sysfs-pin-configs.c b/hdajackretask/sysfs-pin-configs.c > index 4044989..5bae0f9 100644 > --- a/hdajackretask/sysfs-pin-configs.c > +++ b/hdajackretask/sysfs-pin-configs.c > @@ -20,8 +20,10 @@ int get_codec_name_list(codec_name_t* names, int entries) > const gchar* dirname = g_dir_read_name(sysdir); > if (!dirname) > break; > + /* Split e g "hwC0D1" into "hw", "0" and "1" */ > cd = g_strsplit_set(dirname, "CD", 9); > ok = g_strv_length(cd) == 3; > + ok &= strcmp(cd[0], "hw") == 0; > if (ok) { > gchar* filetest = g_strdup_printf("/sys/class/sound/%s/init_pin_configs", dirname); > ok = g_file_test(filetest, G_FILE_TEST_IS_REGULAR); > -- > 1.9.1 >
diff --git a/hdajackretask/sysfs-pin-configs.c b/hdajackretask/sysfs-pin-configs.c index 4044989..5bae0f9 100644 --- a/hdajackretask/sysfs-pin-configs.c +++ b/hdajackretask/sysfs-pin-configs.c @@ -20,8 +20,10 @@ int get_codec_name_list(codec_name_t* names, int entries) const gchar* dirname = g_dir_read_name(sysdir); if (!dirname) break; + /* Split e g "hwC0D1" into "hw", "0" and "1" */ cd = g_strsplit_set(dirname, "CD", 9); ok = g_strv_length(cd) == 3; + ok &= strcmp(cd[0], "hw") == 0; if (ok) { gchar* filetest = g_strdup_printf("/sys/class/sound/%s/init_pin_configs", dirname); ok = g_file_test(filetest, G_FILE_TEST_IS_REGULAR);
On a 3.15 based kernel, both "hdaudioC*D*" and "hwC*D*" shows up under /sys/class/sound, and pointing to the same object. Make sure we only match on the hwC*D* name to avoid duplicate entries. Signed-off-by: David Henningsson <david.henningsson@canonical.com> --- hdajackretask/sysfs-pin-configs.c | 2 ++ 1 file changed, 2 insertions(+)