iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: gb-audio: fix build breakage on 4.1-rc1

Browse Source 
In commit 1efb53a220b7 ("ASoC: simple-card: Remove support for setting
differing DAI formats"), the .fmt field was removed from struct
asoc_simple_dai.  Fix this build breakage by not trying to set it.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Acked-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
Greg Kroah-Hartman 2015-05-08 22:40:47 +02:00
parent 7f3f356e45
commit 61c0926eec
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/greybus/audio.c
View File

@ -106,7 +106,9 @@ struct asoc_simple_card_info *setup_card_info(int device_count)
obj->card_info.codec = obj->codec_name;
obj->card_info.platform = obj->platform_name;
obj->card_info.cpu_dai.name = obj->dai_name;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
obj->card_info.cpu_dai.fmt = GB_FMTS;
#endif
#if USE_RT5645
obj->card_info.daifmt = GB_FMTS;
sprintf(obj->codec_name, "rt5645.%s", "6-001b"); /* XXX do i2c bus addr dynamically */