Commit ab3bbfa1 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

USB: musb: only print info message if probe() is successful 



we were printing the info about musb probe too early where
it was still possible for things to go wrong. Move the
down right before the return 0 statement. While at that
also convert pr_info to dev_info.

Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent da5108e1

drivers/usb/musb/musb_core.c

+12 −13
Original line number Diff line number Diff line
@@ -2004,19 +2004,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
		musb->irq_wake = 0;

	}



	pr_info("%s: USB %s mode controller at %p using %s, IRQ %d\n",

			musb_driver_name,

			({char *s;

			switch (musb->board_mode) {

			case MUSB_HOST:		s = "Host"; break;

			case MUSB_PERIPHERAL:	s = "Peripheral"; break;

			default:		s = "OTG"; break;

			}; s; }),

			ctrl,

			(is_dma_capable() && musb->dma_controller)

				? "DMA" : "PIO",

			musb->nIrq);



	/* host side needs more setup */

	if (is_host_enabled(musb)) {

		struct usb_hcd	*hcd = musb_to_hcd(musb);
@@ -2079,6 +2066,18 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
	if (status)

		goto fail2;



	dev_info(dev, "USB %s mode controller at %p using %s, IRQ %d\n",

			({char *s;

			 switch (musb->board_mode) {

			 case MUSB_HOST:		s = "Host"; break;

			 case MUSB_PERIPHERAL:	s = "Peripheral"; break;

			 default:		s = "OTG"; break;

			 }; s; }),

			ctrl,

			(is_dma_capable() && musb->dma_controller)

			? "DMA" : "PIO",

			musb->nIrq);



	return 0;



fail2: