From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754174AbbDHL3f (ORCPT ); Wed, 8 Apr 2015 07:29:35 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:23602 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753895AbbDHL3b (ORCPT ); Wed, 8 Apr 2015 07:29:31 -0400 X-AuditID: cbfee61a-f79516d000006302-2f-55251119f54b From: Krzysztof Opasiak To: balbi@ti.com, gregkh@linuxfoundation.org, jlbec@evilplan.org Cc: andrzej.p@samsung.com, m.szyprowski@samsung.com, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Krzysztof Opasiak Subject: [PATCH 3/5] usb: gadget: mass_storage: Store lun_opts in fsg_opts Date: Wed, 08 Apr 2015 13:28:46 +0200 Message-id: <1428492528-11993-4-git-send-email-k.opasiak@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1428492528-11993-1-git-send-email-k.opasiak@samsung.com> References: <1428492528-11993-1-git-send-email-k.opasiak@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJLMWRmVeSWpSXmKPExsVy+t9jQV1JQdVQg85uaYtZL9tZLA7er7do XryezeLkuW8sFrcnTmOz2Py9g83i8q45bBaLlrUyW6w9cpfdgdPj6cUgj/1z17B79G1Zxehx /MZ2Jo/Pm+QCWKO4bFJSczLLUov07RK4MtZf2cte0Cpc8e3CaaYGxjMCXYycHBICJhKLLv5k hrDFJC7cW8/WxcjFISQwnVHi3aSfUM4vRonjW7azdjFycLAJ6EvM2yUKYooIOEic2VEEUsIs sI1R4umOGewgg4QFvCROfjoENpRFQFXiwPa1YK28Aq4SvzvCQUwJAQWJOZNsQCo4BdwkHvyd zAZiCwFVdF+byjaBkXcBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjOAAeya1g3Flg8Uh RgEORiUeXoHFKqFCrIllxZW5hxglOJiVRHjPcKmGCvGmJFZWpRblxxeV5qQWH2KU5mBREued oysXKiSQnliSmp2aWpBaBJNl4uCUamAMDg10XHm4Yka5Ae/zo49UGtYGzWqPlDWds8jAZpeu 6m0JRzeOFhGP1GXyQnr6jC9+3eo0/Sw9c73jp1rXr1odtv/U7TdaXnhYKBSxZYVowu1fRkbP HnN7JU27H2Brtv+L4YbXn78+YSo5d6DzUPsmTruuonWqcZqRHvMeVL7eFb3m1f4pTyqVWIoz Eg21mIuKEwG0xinnLAIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Krzysztof Opasiak --- drivers/usb/gadget/function/f_mass_storage.c | 5 +++++ drivers/usb/gadget/function/f_mass_storage.h | 1 + 2 files changed, 6 insertions(+) diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c index 811929c..095b618 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -3372,6 +3372,8 @@ static struct config_group *fsg_lun_make(struct config_group *group, } opts->lun = fsg_opts->common->luns[num]; opts->lun_id = num; + BUG_ON(fsg_opts->lun_opts[num]); + fsg_opts->lun_opts[num] = opts; mutex_unlock(&fsg_opts->lock); config_group_init_type_name(&opts->group, name, &fsg_lun_type); @@ -3400,6 +3402,7 @@ static void fsg_lun_drop(struct config_group *group, struct config_item *item) fsg_common_remove_lun(lun_opts->lun, fsg_opts->common->sysfs); fsg_opts->common->luns[lun_opts->lun_id] = NULL; + fsg_opts->lun_opts[lun_opts->lun_id] = NULL; lun_opts->lun_id = 0; mutex_unlock(&fsg_opts->lock); @@ -3546,6 +3549,7 @@ static struct usb_function_instance *fsg_alloc_inst(void) if (!opts) return ERR_PTR(-ENOMEM); mutex_init(&opts->lock); + memset(opts->lun_opts, 0, sizeof(opts->lun_opts)); opts->func_inst.free_func_inst = fsg_free_inst; opts->common = fsg_common_setup(opts->common); if (IS_ERR(opts->common)) { @@ -3569,6 +3573,7 @@ static struct usb_function_instance *fsg_alloc_inst(void) (const char **)&opts->func_inst.group.cg_item.ci_name); opts->lun0.lun = opts->common->luns[0]; opts->lun0.lun_id = 0; + opts->lun_opts[0] = &opts->lun0; config_group_init_type_name(&opts->lun0.group, "lun.0", &fsg_lun_type); opts->default_groups[0] = &opts->lun0.group; opts->func_inst.group.default_groups = opts->default_groups; diff --git a/drivers/usb/gadget/function/f_mass_storage.h b/drivers/usb/gadget/function/f_mass_storage.h index b4866fc..0a7c656 100644 --- a/drivers/usb/gadget/function/f_mass_storage.h +++ b/drivers/usb/gadget/function/f_mass_storage.h @@ -81,6 +81,7 @@ struct fsg_opts { struct fsg_common *common; struct usb_function_instance func_inst; struct fsg_lun_opts lun0; + struct fsg_lun_opts *lun_opts[FSG_MAX_LUNS]; struct config_group *default_groups[2]; bool no_configfs; /* for legacy gadgets */ -- 1.7.9.5