[PATCH 1/4] usb: gadget: u_uac1: fix build issue

[PATCH 1/4] usb: gadget: u_uac1: fix build issue

[Huang Rui]

Since gaudio member is removed at f_uac1_opts, it also needs to remove the
cleanup call of gaudio member at f_uac1_opts when the usb function instance
is freed.

See below error message:
  CC [M]  drivers/gpu/drm/nouveau/core/subdev/vm/nv50.o
  CC [M]  drivers/staging/lustre/lnet/selftest/module.o
drivers/usb/gadget/function/f_uac1.c: In function ‘f_audio_free_inst’:
drivers/usb/gadget/function/f_uac1.c:904:21: error: ‘struct f_uac1_opts’ has no member named ‘card’
  gaudio_cleanup(opts->card);
                     ^
make[4]: *** [drivers/usb/gadget/function/f_uac1.o] Error 1
make[3]: *** [drivers/usb/gadget/function] Error 2
make[2]: *** [drivers/usb/gadget] Error 2
make[2]: *** Waiting for unfinished jobs....
  CC [M]  drivers/staging/lustre/lnet/selftest/ping_test.o

Signed-off-by: Huang Rui <ray.huang@amd.com>
Cc: Peter Chen <peter.chen@freescale.com>
---

Felipe,

As mentioned at previous mail, this fix is for your current testing/next
branch.

Thanks,
Rui

---

 drivers/usb/gadget/function/f_uac1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 9cf2252..3196e34 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -901,7 +901,7 @@ static void f_audio_free_inst(struct usb_function_instance *f)
 	struct f_uac1_opts *opts;
 
 	opts = container_of(f, struct f_uac1_opts, func_inst);
-	gaudio_cleanup(opts->card);
+
 	if (opts->fn_play_alloc)
 		kfree(opts->fn_play);
 	if (opts->fn_cap_alloc)
-- 
1.9.1

RE: [PATCH 1/4] usb: gadget: u_uac1: fix build issue

[Peter Chen]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1235 bytes --]

 
> See below error message:
>   CC [M]  drivers/gpu/drm/nouveau/core/subdev/vm/nv50.o
>   CC [M]  drivers/staging/lustre/lnet/selftest/module.o
> drivers/usb/gadget/function/f_uac1.c: In function ‘f_audio_free_inst’:
> drivers/usb/gadget/function/f_uac1.c:904:21: error: ‘struct f_uac1_opts’ has
> no member named ‘card’
>   gaudio_cleanup(opts->card);
>                      ^
> make[4]: *** [drivers/usb/gadget/function/f_uac1.o] Error 1
> make[3]: *** [drivers/usb/gadget/function] Error 2
> make[2]: *** [drivers/usb/gadget] Error 2
> make[2]: *** Waiting for unfinished jobs....
>   CC [M]  drivers/staging/lustre/lnet/selftest/ping_test.o
> 
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> Cc: Peter Chen <peter.chen@freescale.com>
> ---
> 

Oh, my three patches have dependencies, it needs to rebase Felipe's fixes tree to fix this problem.

commit 4fde6204df052bb89ba3d915ed6ed9f306f3cfa1
Author: Peter Chen <peter.chen@freescale.com>
Date:   Mon Dec 1 16:09:27 2014 +0800

    usb: gadget: f_uac1: access freed memory at f_audio_free_inst



Peter

 

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [PATCH 1/4] usb: gadget: u_uac1: fix build issue

[Huang Rui]

On Tue, Jan 13, 2015 at 06:51:40AM +0000, Peter Chen wrote:
>  
> > See below error message:
> >   CC [M]  drivers/gpu/drm/nouveau/core/subdev/vm/nv50.o
> >   CC [M]  drivers/staging/lustre/lnet/selftest/module.o
> > drivers/usb/gadget/function/f_uac1.c: In function ‘f_audio_free_inst’:
> > drivers/usb/gadget/function/f_uac1.c:904:21: error: ‘struct f_uac1_opts’ has
> > no member named ‘card’
> >   gaudio_cleanup(opts->card);
> >                      ^
> > make[4]: *** [drivers/usb/gadget/function/f_uac1.o] Error 1
> > make[3]: *** [drivers/usb/gadget/function] Error 2
> > make[2]: *** [drivers/usb/gadget] Error 2
> > make[2]: *** Waiting for unfinished jobs....
> >   CC [M]  drivers/staging/lustre/lnet/selftest/ping_test.o
> > 
> > Signed-off-by: Huang Rui <ray.huang@amd.com>
> > Cc: Peter Chen <peter.chen@freescale.com>
> > ---
> > 
> 
> Oh, my three patches have dependencies, it needs to rebase Felipe's fixes tree to fix this problem.
> 
> commit 4fde6204df052bb89ba3d915ed6ed9f306f3cfa1
> Author: Peter Chen <peter.chen@freescale.com>
> Date:   Mon Dec 1 16:09:27 2014 +0800
> 
>     usb: gadget: f_uac1: access freed memory at f_audio_free_inst
> 
> 
> 
> Peter
> 

I see, that's OK. :)

Thanks,
Rui

Re: [PATCH 1/4] usb: gadget: u_uac1: fix build issue

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]

Hi,

On Tue, Jan 13, 2015 at 06:51:40AM +0000, Peter Chen wrote:
>  
> > See below error message:
> >   CC [M]  drivers/gpu/drm/nouveau/core/subdev/vm/nv50.o
> >   CC [M]  drivers/staging/lustre/lnet/selftest/module.o
> > drivers/usb/gadget/function/f_uac1.c: In function ‘f_audio_free_inst’:
> > drivers/usb/gadget/function/f_uac1.c:904:21: error: ‘struct f_uac1_opts’ has
> > no member named ‘card’
> >   gaudio_cleanup(opts->card);
> >                      ^
> > make[4]: *** [drivers/usb/gadget/function/f_uac1.o] Error 1
> > make[3]: *** [drivers/usb/gadget/function] Error 2
> > make[2]: *** [drivers/usb/gadget] Error 2
> > make[2]: *** Waiting for unfinished jobs....
> >   CC [M]  drivers/staging/lustre/lnet/selftest/ping_test.o
> > 
> > Signed-off-by: Huang Rui <ray.huang@amd.com>
> > Cc: Peter Chen <peter.chen@freescale.com>
> > ---
> > 
> 
> Oh, my three patches have dependencies, it needs to rebase Felipe's
> fixes tree to fix this problem.
> 
> commit 4fde6204df052bb89ba3d915ed6ed9f306f3cfa1
> Author: Peter Chen <peter.chen@freescale.com>
> Date:   Mon Dec 1 16:09:27 2014 +0800
> 
>     usb: gadget: f_uac1: access freed memory at f_audio_free_inst

Yeah, once that gets merged by Linus, I'll merge v3.19-rc5 on my next
branch, that should sort it all out.

This is one great example of why you should never make new features
depend on fixes. We will always sort out the merge conflicts later.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]