diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-18 14:55:32 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-18 14:55:32 +0300 |
| commit | b68cbc1d1d5c153dffa877fa612f70b2338a1d5a (patch) | |
| tree | fd13e0196d6e6f7558e6dddf2a707425e392b0f1 /sound/soc/intel/boards/cht_bsw_rt5672.c | |
| parent | 49fdfe365513684a4b2d8a421e1383084eef5273 (diff) | |
| parent | e29a22a86a20ea7651ff8c731ab034c31bd9764e (diff) | |
| download | linux-b68cbc1d1d5c153dffa877fa612f70b2338a1d5a.tar.xz | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/boards/cht_bsw_rt5672.c')
| -rw-r--r-- | sound/soc/intel/boards/cht_bsw_rt5672.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index f8f21eee9b2d..c14a52d2f714 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -35,7 +35,7 @@ struct cht_mc_private { struct snd_soc_jack headset; - char codec_name[16]; + char codec_name[SND_ACPI_I2C_ID_LEN]; struct clk *mclk; }; @@ -396,7 +396,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) /* fixup codec name based on HID */ if (mach) { - i2c_name = snd_soc_acpi_find_name_from_hid(mach->id); + i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); if (i2c_name) { snprintf(drv->codec_name, sizeof(drv->codec_name), "i2c-%s", i2c_name); |