From: Huang Rui <ray.huang@amd.com>
To: Felipe Balbi <balbi@ti.com>, Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Huang Rui <ray.huang@amd.com>,
Peter Chen <peter.chen@freescale.com>
Subject: [PATCH 1/4] usb: gadget: u_uac1: fix build issue
Date: Tue, 13 Jan 2015 14:20:34 +0800 [thread overview]
Message-ID: <1421130034-1891-1-git-send-email-ray.huang@amd.com> (raw)
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
next reply other threads:[~2015-01-13 6:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 6:20 Huang Rui [this message]
2015-01-13 6:51 ` Peter Chen
2015-01-13 7:09 ` Huang Rui
2015-01-13 15:42 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421130034-1891-1-git-send-email-ray.huang@amd.com \
--to=ray.huang@amd.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@freescale.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®