| Message ID | 1343741493-17671-6-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 07/31/2012 05:31 PM, Lee Jones wrote: Subject doesn't parse for me... > The platform attempts to register platform device 'snd_soc_u8500' > which doesn't actually exist. Here we change the reference to the > correct one 'snd_soc_mop500'. > Signed-off-by: Lee Jones <lee.jones@linaro.org> WBR, Sergei
On 31/07/12 17:46, Sergei Shtylyov wrote: > Hello. > > On 07/31/2012 05:31 PM, Lee Jones wrote: > > Subject doesn't parse for me... > >> The platform attempts to register platform device 'snd_soc_u8500' >> which doesn't actually exist. Here we change the reference to the >> correct one 'snd_soc_mop500'. > >> Signed-off-by: Lee Jones <lee.jones@linaro.org> Actually, it does make sense? As a sentence: "This patch fixes merge error: so such structure 'struct snd_soc_u8500'.
On 01/08/12 08:37, Lee Jones wrote: > On 31/07/12 17:46, Sergei Shtylyov wrote: >> Hello. >> >> On 07/31/2012 05:31 PM, Lee Jones wrote: >> >> Subject doesn't parse for me... >> >>> The platform attempts to register platform device 'snd_soc_u8500' >>> which doesn't actually exist. Here we change the reference to the >>> correct one 'snd_soc_mop500'. >> >>> Signed-off-by: Lee Jones <lee.jones@linaro.org> > > Actually, it does make sense? > > As a sentence: "This patch fixes merge error: so such structure 'struct snd_soc_u8500'. That's interesting. Not only when I read it did it seem correct, I also wrote it wrong "as a sentence". Of course "so" should be "no".
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index 9960480..1b6a193 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -228,7 +228,7 @@ int mop500_msp_init(struct device *parent) struct platform_device *msp1; pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__); - platform_device_register(&snd_soc_u8500); + platform_device_register(&snd_soc_mop500); pr_info("Initialize MSP I2S-devices.\n"); db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
The platform attempts to register platform device 'snd_soc_u8500' which doesn't actually exist. Here we change the reference to the correct one 'snd_soc_mop500'. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- arch/arm/mach-ux500/board-mop500-msp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)