usb: ehci-s5p: Use devm for requesting ehci_vbus_gpio
Subsystems (2)
PATCH 1/1 usb: ehci-s5p: Use devm for requesting ehci_vbus_gpio
The ehci_vbus_gpio is requested but never freed. This can cause problems with deferred probes and would cause problems if s5p_ehci_remove was ever called. Use devm to fix this.
--- drivers/usb/host/ehci-s5p.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/host/ehci-s5p.c +3 -1
@@ -92,6 +92,7 @@ static void s5p_ehci_phy_disable(struct s5p_ehci_hcd *s5p_ehci)static void s5p_setup_vbus_gpio (struct platform_device *pdev) { +struct device *dev = &pdev->dev;int err;int gpio;
@@ -103,7 +104,8 @@ static void s5p_setup_vbus_gpio(struct platform_device *pdev)if (!gpio_is_valid (gpio))return ; - err =gpio_request_one (gpio,GPIOF_OUT_INIT_HIGH ,"ehci_vbus_gpio" ); + err =devm_gpio_request_one (dev, gpio,GPIOF_OUT_INIT_HIGH , +"ehci_vbus_gpio" );if (err)dev_err (&pdev->dev,"can't request ehci vbus gpio %d" , gpio); }
Signature · 1 line
1.8.1.3
PATCH v2 1/1 usb: ehci-s5p: Use devm for requesting ehci_vbus_gpio
The ehci_vbus_gpio is requested but never freed. This can cause problems with deferred probes and would cause problems if s5p_ehci_remove was ever called. Use devm to fix this.
---
Changes in v2:
- &pdev->dev => dev elsewhere in s5p_setup_vbus_gpio()
drivers/usb/host/ehci-s5p.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/usb/host/ehci-s5p.c +6 -5
@@ -92,20 +92,21 @@ static void s5p_ehci_phy_disable(struct s5p_ehci_hcd *s5p_ehci)static void s5p_setup_vbus_gpio (struct platform_device *pdev) { +struct device *dev = &pdev->dev;int err;int gpio; -if (!pdev->dev.of_node) +if (!dev->of_node)return ; - gpio =of_get_named_gpio (pdev->dev.of_node, -"samsung,vbus-gpio" ,0 ); + gpio =of_get_named_gpio (dev->of_node,"samsung,vbus-gpio" ,0 );if (!gpio_is_valid (gpio))return ; - err =gpio_request_one (gpio,GPIOF_OUT_INIT_HIGH ,"ehci_vbus_gpio" ); + err =devm_gpio_request_one (dev, gpio,GPIOF_OUT_INIT_HIGH , +"ehci_vbus_gpio" );if (err) -dev_err (&pdev->dev,"can't request ehci vbus gpio %d" , gpio); +dev_err (dev,"can't request ehci vbus gpio %d" , gpio); }static u64 ehci_s5p_dma_mask =DMA_BIT_MASK (32 );
Signature · 1 line
1.8.1.3
Quoted 6 lines · Doug Anderson
The
ehci_vbus_gpiois requested but never freed. This can cause problems with deferred probes and would cause problems ifs5p_ehci_removewas ever called. Use devm to fix this.Signed-off-by Doug Anderson <[email protected]>
Thanks.
- Kukjin
Quoted 25 lines
---
Changes in v2:
-&pdev->dev=> dev elsewhere ins5p_setup_vbus_gpio()drivers/usb/host/ehci-s5p.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)drivers/usb/host/ehci-s5p.c +2
-2@@ -92,20 +92,21 @@ static void s5p_ehci_phy_disable(struct s5p_ehci_hcd *s5p_ehci)static void s5p_setup_vbus_gpio (struct platform_device *pdev) { +struct device *dev = &pdev->dev;int err;int gpio; -if (!pdev->dev.of_node) +if (!dev->of_node)return ; - gpio = of_get_named_gpio(pdev->dev.of_node,
drivers/usb/host/ehci-s5p.c static void s5p_ehci_phy_disable(struct s5p_ehci_hcd · line 109
Quoted 10 lines
drivers/usb/host/ehci-s5p.c +3
-3- "samsung,vbus-gpio", 0); + gpio =of_get_named_gpio (dev->of_node,"samsung,vbus-gpio" ,0 );if (!gpio_is_valid (gpio))return ; - err =gpio_request_one (gpio,GPIOF_OUT_INIT_HIGH ,"ehci_vbus_gpio" ); + err =devm_gpio_request_one (dev, gpio,GPIOF_OUT_INIT_HIGH , +"ehci_vbus_gpio" );if (err) - dev_err(&pdev->dev, "can't request ehci vbus gpio %d",
gpio);
Quoted 6 lines
drivers/usb/host/ehci-s5p.c +1
-0+dev_err (dev,"can't request ehci vbus gpio %d" , gpio); }static u64
ehci_s5p_dma_mask=DMA_BIT_MASK(32);
--
1.8.1.3