diff options
| -rw-r--r-- | sound/soc/intel/boards/bytcr_rt5640.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 940eb27158da..f9175cf6747e 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c | |||
| @@ -1154,7 +1154,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) | |||
| 1154 | struct byt_rt5640_private *priv; | 1154 | struct byt_rt5640_private *priv; |
| 1155 | struct snd_soc_acpi_mach *mach; | 1155 | struct snd_soc_acpi_mach *mach; |
| 1156 | const char *platform_name; | 1156 | const char *platform_name; |
| 1157 | const char *i2c_name = NULL; | 1157 | struct acpi_device *adev; |
| 1158 | int ret_val = 0; | 1158 | int ret_val = 0; |
| 1159 | int dai_index = 0; | 1159 | int dai_index = 0; |
| 1160 | int i; | 1160 | int i; |
| @@ -1178,11 +1178,11 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) | |||
| 1178 | } | 1178 | } |
| 1179 | 1179 | ||
| 1180 | /* fixup codec name based on HID */ | 1180 | /* fixup codec name based on HID */ |
| 1181 | i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); | 1181 | adev = acpi_dev_get_first_match_dev(mach->id, NULL, -1); |
| 1182 | if (i2c_name) { | 1182 | if (adev) { |
| 1183 | snprintf(byt_rt5640_codec_name, sizeof(byt_rt5640_codec_name), | 1183 | snprintf(byt_rt5640_codec_name, sizeof(byt_rt5640_codec_name), |
| 1184 | "%s%s", "i2c-", i2c_name); | 1184 | "i2c-%s", acpi_dev_name(adev)); |
| 1185 | 1185 | put_device(&adev->dev); | |
| 1186 | byt_rt5640_dais[dai_index].codec_name = byt_rt5640_codec_name; | 1186 | byt_rt5640_dais[dai_index].codec_name = byt_rt5640_codec_name; |
| 1187 | } | 1187 | } |
| 1188 | 1188 | ||
