Re: [PATCH - bugfix for 3.11] usb/gadget: ether: put_usb_function on unbind

2013-07-25 Thread Michal Nazarewicz 
On Wed, Jul 24 2013, Andrzej Pietrasiewicz wrote:
 Fix bugs introduced in

 9c62ce83e4258bacc459faf57bf2ed83cce6be08
 usb: gadget: ether: convert to new interface of f_ecm

 94b5573e97729f0e1496d23b69cbe2c6b24ec0c3
 usb: gadget: ether: convert to new interface of f_eem

 8af5232d6f48896b151898ccb2e9e155481bb785
 usb: gadget: ether: convert to new interface of f_subset

 9bd4a10e1bf881af0b0a7c117c7092b558447047
 usb: gadget: ether: convert to new interface of f_rndis

 Signed-off-by: Andrzej Pietrasiewicz andrze...@samsung.com
 Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com

Acked-by: Michal Nazarewicz min...@mina86.com

 ---
  drivers/usb/gadget/ether.c |   14 ++
  1 files changed, 10 insertions(+), 4 deletions(-)

 diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
 index f48712f..c1c113e 100644
 --- a/drivers/usb/gadget/ether.c
 +++ b/drivers/usb/gadget/ether.c
 @@ -449,14 +449,20 @@ fail:
  
  static int __exit eth_unbind(struct usb_composite_dev *cdev)
  {
 - if (has_rndis())
 + if (has_rndis()) {
 + usb_put_function(f_rndis);
   usb_put_function_instance(fi_rndis);
 - if (use_eem)
 + }
 + if (use_eem) {
 + usb_put_function(f_eem);
   usb_put_function_instance(fi_eem);
 - else if (can_support_ecm(cdev-gadget))
 + } else if (can_support_ecm(cdev-gadget)) {
 + usb_put_function(f_ecm);
   usb_put_function_instance(fi_ecm);
 - else
 + } else {
 + usb_put_function(f_geth);
   usb_put_function_instance(fi_geth);
 + }
   return 0;
  }
  
 -- 
 1.7.0.4


-- 
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of  o' \,=./ `o
..o | Computer Science,  Michał “mina86” Nazarewicz(o o)
ooo +email/xmpp: m...@google.com--ooO--(_)--Ooo--

signature.asc
Description: PGP signature

[PATCH - bugfix for 3.11] usb/gadget: ether: put_usb_function on unbind

2013-07-24 Thread Andrzej Pietrasiewicz 
Fix bugs introduced in

9c62ce83e4258bacc459faf57bf2ed83cce6be08
usb: gadget: ether: convert to new interface of f_ecm

94b5573e97729f0e1496d23b69cbe2c6b24ec0c3
usb: gadget: ether: convert to new interface of f_eem

8af5232d6f48896b151898ccb2e9e155481bb785
usb: gadget: ether: convert to new interface of f_subset

9bd4a10e1bf881af0b0a7c117c7092b558447047
usb: gadget: ether: convert to new interface of f_rndis

Signed-off-by: Andrzej Pietrasiewicz andrze...@samsung.com
Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com
---
 drivers/usb/gadget/ether.c |   14 ++
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index f48712f..c1c113e 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -449,14 +449,20 @@ fail:
 
 static int __exit eth_unbind(struct usb_composite_dev *cdev)
 {
-   if (has_rndis())
+   if (has_rndis()) {
+   usb_put_function(f_rndis);
usb_put_function_instance(fi_rndis);
-   if (use_eem)
+   }
+   if (use_eem) {
+   usb_put_function(f_eem);
usb_put_function_instance(fi_eem);
-   else if (can_support_ecm(cdev-gadget))
+   } else if (can_support_ecm(cdev-gadget)) {
+   usb_put_function(f_ecm);
usb_put_function_instance(fi_ecm);
-   else
+   } else {
+   usb_put_function(f_geth);
usb_put_function_instance(fi_geth);
+   }
return 0;
 }
 
-- 
1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html