xhci: Fix merge derp

Signed-off-by: LaboDJ <jacopolabardi@gmail.com>
StefanescuCristian · Jun 3, 2014 · 3dfe075 · 3dfe075
1 parent 66e45a5
commit 3dfe075
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
@@ -393,10 +393,6 @@ static inline void xhci_cleanup_msix(struct xhci_hcd *xhci)
 {
 }
 
-static inline void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
-{
-}
-
 #endif /* CONFIG_PCI */
 
 static void compliance_mode_recovery(unsigned long arg)
@@ -804,7 +800,7 @@ static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
 	}
 }
 #else
-static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
+static inline void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
 {
 }
 #endif /* CONFIG_PCI */
@@ -4003,7 +3999,7 @@ int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
 	unsigned int	port_num;
 	unsigned long	flags;
 	int		hird;
-	bool		delay;
+	bool		delay = false;
 
 	if (hcd->speed == HCD_USB3 || !xhci->hw_lpm_support ||
 			!udev->lpm_capable)