usb: gadget: langwell_udc: Fix error path
PATCH 1/1 usb: gadget: langwell_udc: Fix error path
- call device_unregister() only when device_register() is sucess.
- call put_device() when device_register() fails.
--- drivers/usb/gadget/langwell_udc.c | 18 ++++++++++++++---- drivers/usb/gadget/langwell_udc.h | 4 +++- 2 files changed, 17 insertions(+), 5 deletions(-)
drivers/usb/gadget/langwell_udc.c +14 -4
@@ -2952,8 +2952,13 @@ static void langwell_udc_remove(struct pci_dev *pdev)INFO (dev,"unbind\n" );DBG (dev,"<--- %s()\n" , __func__); -device_unregister (&dev->gadget.dev); -device_remove_file (&pdev->dev, &dev_attr_langwell_udc); +if (dev->dev_reg_status ==2 ) +device_unregister (&dev->gadget.dev); +else if (dev->dev_reg_status ==1 ) +put_device (&dev->gadget.dev); + +if (dev->dev_create_file) +device_remove_file (&pdev->dev, &dev_attr_langwell_udc);#ifndef OTG_TRANSCEIVER pci_set_drvdata (pdev,NULL );
@@ -3190,12 +3195,17 @@ static int langwell_udc_probe(struct pci_dev *pdev, the_controller = dev; retval =device_register (&dev->gadget.dev); -if (retval) +if (retval) { + dev_reg_status =1 ; goto error; + } + dev_reg_status =2 ; retval =device_create_file (&pdev->dev, &dev_attr_langwell_udc); -if (retval) +if (retval) { + dev_create_file =1 ; goto error; + }VDBG (dev,"<--- %s()\n" , __func__);return 0 ;
drivers/usb/gadget/langwell_udc.h +3 -1
@@ -199,7 +199,9 @@ struct langwell_udc { vbus_active:1, suspended:1, stopped:1, - lpm:1; /* LPM capability */ + lpm:1, /* LPM capability */ + dev_reg_status:2, + dev_create_file:1;/* pci state used to access those endpoints */ struct pci_dev *pdev;
Signature · 1 line
1.7.2.3
Hello.
Quoted 1 line · Rahul Ruikar
- call
device_unregister()only whendevice_register()is sucess.
s/is sucess/succeeds/
Quoted 29 lines
- call
put_device()whendevice_register()fails.Signed-off-by Rahul Ruikar<[email protected]>--- drivers/usb/gadget/langwell_udc.c | 18 ++++++++++++++---- drivers/usb/gadget/langwell_udc.h | 4 +++- 2 files changed, 17 insertions(+), 5 deletions(-)drivers/usb/gadget/langwell_udc.c +7
-2@@ -2952,8 +2952,13 @@ static void langwell_udc_remove(struct pci_dev *pdev)INFO (dev,"unbind\n" );DBG (dev,"<--- %s()\n" , __func__); -device_unregister (&dev->gadget.dev); -device_remove_file (&pdev->dev,&dev_attr_langwell_udc); +if (dev->dev_reg_status ==2 ) +device_unregister (&dev->gadget.dev); +else if (dev->dev_reg_status ==1 ) +put_device (&dev->gadget.dev); + +if (dev->dev_create_file) +device_remove_file (&pdev->dev,&dev_attr_langwell_udc);#ifndef OTG_TRANSCEIVER pci_set_drvdata (pdev,NULL );
drivers/usb/gadget/langwell_udc.c static int langwell_udc_probe(struct pci_dev *pdev, · line 3199
Quoted 6 lines
drivers/usb/gadget/langwell_udc.c +2
-1@@ -3190,12 +3195,17 @@ static int langwell_udc_probe(struct pci_dev *pdev, the_controller = dev; retval =device_register (&dev->gadget.dev); -if (retval) +if (retval) { + dev_reg_status =1 ;
Did you mean 'dev->dev_reg_status'?
drivers/usb/gadget/langwell_udc.c static int langwell_udc_probe(struct pci_dev *pdev, · line 3202
Quoted 3 lines
drivers/usb/gadget/langwell_udc.c +2
-0goto error; + } + dev_reg_status =2 ;
Same question.
drivers/usb/gadget/langwell_udc.c static int langwell_udc_probe(struct pci_dev *pdev, · line 3206
Quoted 5 lines
drivers/usb/gadget/langwell_udc.c +2
-1retval =device_create_file (&pdev->dev,&dev_attr_langwell_udc); -if (retval) +if (retval) { + dev_create_file =1 ;
Did you mean 'dev->dev_create_file'?
WBR, Sergei
will resubmit this patch alongwith other patches.
Thanks
- Rahul Ruikar
Quoted 65 lines · Sergei Shtylyov
Hello.
Quoted 1 line · Rahul Ruikar
- call
device_unregister()only whendevice_register()is sucess.s/is sucess/succeeds/
Quoted 31 lines
- call
put_device()whendevice_register()fails.Signed-off-by Rahul Ruikar<[email protected]>---
drivers/usb/gadget/langwell_udc.c | 18 ++++++++++++++----drivers/usb/gadget/langwell_udc.h| 4 +++-2 files changed, 17 insertions(+), 5 deletions(-)drivers/usb/gadget/langwell_udc.c +7
-2@@ -2952,8 +2952,13 @@ static void langwell_udc_remove(struct pci_dev *pdev) INFO(dev, "unbind\n"); DBG(dev, "<--- %s()\n", __func__); - device_unregister(&dev->gadget.dev); - device_remove_file(&pdev->dev,&dev_attr_langwell_udc); + if (dev->dev_reg_status == 2) + device_unregister(&dev->gadget.dev); + else if (dev->dev_reg_status == 1) + put_device(&dev->gadget.dev); + + if (dev->dev_create_file) + device_remove_file(&pdev->dev,&dev_attr_langwell_udc); #ifndef OTG_TRANSCEIVERpci_set_drvdata(pdev, NULL);
drivers/usb/gadget/langwell_udc.c static int langwell_udc_probe(struct pci_dev · line 3200
Quoted 7 lines
drivers/usb/gadget/langwell_udc.c +2
-1@@ -3190,12 +3195,17 @@ static int langwell_udc_probe(struct pci_dev *pdev, the_controller = dev; retval = device_register(&dev->gadget.dev); - if (retval) + if (retval) { + dev_reg_status = 1;Did you mean '
dev->dev_reg_status'?drivers/usb/gadget/langwell_udc.c static int langwell_udc_probe(struct pci_dev *pdev, · line 3202
Quoted 3 lines
drivers/usb/gadget/langwell_udc.c +2
-0goto error; + } + dev_reg_status = 2;Same question.
drivers/usb/gadget/langwell_udc.c static int langwell_udc_probe(struct pci_dev *pdev, · line 3206
Quoted 5 lines
drivers/usb/gadget/langwell_udc.c +2
-1retval = device_create_file(&pdev->dev,&dev_attr_langwell_udc); - if (retval) + if (retval) { + dev_create_file = 1;Did you mean '
dev->dev_create_file'?WBR, Sergei