Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68144e0c authored by Philipp Zabel's avatar Philipp Zabel Committed by Greg Kroah-Hartman
Browse files

USB: otg: add otg_put_transceiver() 



As Russell King points out, calling put_device(otg_transceiver->dev)
directly in driver cleanup paths makes assumptions about otg_transceiver
internals.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6084f1bf

arch/arm/plat-omap/usb.c

+6 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ struct otg_transceiver *otg_get_transceiver(void) 
}

EXPORT_SYMBOL(otg_get_transceiver);



void otg_put_transceiver(struct otg_transceiver *x)

{

	put_device(x->dev);

}

EXPORT_SYMBOL(otg_put_transceiver);



int otg_set_transceiver(struct otg_transceiver *x)

{

	if (xceiv && x)

drivers/usb/gadget/omap_udc.c

+2 −2
Original line number Diff line number Diff line
@@ -3006,7 +3006,7 @@ static int __init omap_udc_probe(struct platform_device *pdev) 


cleanup0:

	if (xceiv)

		put_device(xceiv->dev);

		otg_put_transceiver(xceiv);



	if (cpu_is_omap16xx() || cpu_is_omap24xx()) {

		clk_disable(hhc_clk);
@@ -3034,7 +3034,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev) 


	pullup_disable(udc);

	if (udc->transceiver) {

		put_device(udc->transceiver->dev);

		otg_put_transceiver(udc->transceiver);

		udc->transceiver = NULL;

	}

	omap_writew(0, UDC_SYSCON1);

include/linux/usb/otg.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ extern int otg_set_transceiver(struct otg_transceiver *); 


/* for usb host and peripheral controller drivers */

extern struct otg_transceiver *otg_get_transceiver(void);

extern void otg_put_transceiver(struct otg_transceiver *);



static inline int

otg_start_hnp(struct otg_transceiver *otg)