usb: gadget: langwell_udc: Fix error path
PATCH 1/1 usb: gadget: langwell_udc: Fix error path
Fix for following cases
- Call device_unregister() only when device_register() succeeds.
- Call put_device() when device_register() fails.
- Call device_remove_file() only when device_create_file() succeeds.
--- drivers/usb/gadget/langwell_udc.c | 14 +++++++++++--- drivers/usb/gadget/langwell_udc.h | 4 +++- 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/usb/gadget/langwell_udc.c +11 -3
@@ -2952,8 +2952,11 @@ 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->reg_status) +device_unregister (&dev->gadget.dev); + +if (dev->file_created) +device_remove_file (&pdev->dev, &dev_attr_langwell_udc);#ifndef OTG_TRANSCEIVER pci_set_drvdata (pdev,NULL );
@@ -3190,13 +3193,18 @@ static int langwell_udc_probe(struct pci_dev *pdev, the_controller = dev; retval =device_register (&dev->gadget.dev); -if (retval) +if (retval) { +put_device (&dev->gadget.dev); goto error; + } + dev->reg_status =1 ; retval =device_create_file (&pdev->dev, &dev_attr_langwell_udc);if (retval) goto error; + dev->file_created =1 ; +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 */ + reg_status:1, + file_created:1;/* pci state used to access those endpoints */ struct pci_dev *pdev;
Signature · 1 line
1.7.2.3
Greg,
Kindly apply this patch.
- Rahul Ruikar
Quoted 68 lines · Rahul Ruikar
Fix for following cases
- Calldevice_unregister()only whendevice_register()succeeds.
- Callput_device()whendevice_register()fails.
- Calldevice_remove_file()only whendevice_create_file()succeeds.Signed-off-by Rahul Ruikar <[email protected]>---
drivers/usb/gadget/langwell_udc.c | 14 +++++++++++---drivers/usb/gadget/langwell_udc.h| 4 +++-2 files changed, 14 insertions(+), 4 deletions(-)drivers/usb/gadget/langwell_udc.c +11
-3@@ -2952,8 +2952,11 @@ 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->reg_status) + device_unregister(&dev->gadget.dev); + + if (dev->file_created) + device_remove_file(&pdev->dev, &dev_attr_langwell_udc); #ifndef OTG_TRANSCEIVER pci_set_drvdata(pdev, NULL);@@ -3190,13 +3193,18 @@ static int langwell_udc_probe(struct pci_dev *pdev, the_controller = dev; retval = device_register(&dev->gadget.dev); - if (retval) + if (retval) { + put_device(&dev->gadget.dev); goto error; + } + dev->reg_status = 1; retval = device_create_file(&pdev->dev, &dev_attr_langwell_udc); if (retval) goto error; + dev->file_created = 1; + VDBG(dev, "<--- %s()\n", __func__); return 0;drivers/usb/gadget/langwell_udc.h +3
-2@@ -199,7 +199,9 @@ struct langwell_udc { vbus_active:1, suspended:1, stopped:1, - lpm:1; /* LPM capability */ + lpm:1, /* LPM capability */ + reg_status:1, + file_created:1; /* pci state used to access those endpoints */ struct pci_dev *pdev; --1.7.2.3
Quoted 10 lines · Rahul Ruikar
Fix for following cases
- Calldevice_unregister()only whendevice_register()succeeds.
- Callput_device()whendevice_register()fails.
- Calldevice_remove_file()only whendevice_create_file()succeeds.Signed-off-by Rahul Ruikar <[email protected]>--- drivers/usb/gadget/langwell_udc.c | 14 +++++++++++--- drivers/usb/gadget/langwell_udc.h | 4 +++- 2 files changed, 14 insertions(+), 4 deletions(-)
This patch doesn't apply at all to my tree. Can you redo it against the latest linux-next release?
thanks,
greg k-h
Ok no problem.
I had sent it because yesterday you asked me to send it again.
- Rahul Ruikar
Quoted 19 lines · Greg KH
Quoted 10 lines · Rahul Ruikar
Fix for following cases
- Calldevice_unregister()only whendevice_register()succeeds.
- Callput_device()whendevice_register()fails.
- Calldevice_remove_file()only whendevice_create_file()succeeds.Signed-off-by Rahul Ruikar <[email protected]>---
drivers/usb/gadget/langwell_udc.c | 14 +++++++++++---drivers/usb/gadget/langwell_udc.h| 4 +++-2 files changed, 14 insertions(+), 4 deletions(-)This patch doesn't apply at all to my tree. Can you redo it against the latest linux-next release?
thanks,
greg k-h
Quoted 2 lines · Rahul Ruikar
Ok no problem.
I had sent it because yesterday you asked me to send it again.
Yes, but I assumed it would be in a form that I could apply it in :)
thanks,
greg k-h