Merge 2.6.38-rc5 into usb-next

[~andy/linux] / drivers / usb / host / ehci-hub.c

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 8a515f0d59880dae68d8c55fcd885fc914c6d71b..c0b37fedfbc2b8ffaadfee08b72adf9b39abe56b 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -538,14 +538,15 @@ static ssize_t store_companion(struct device *dev,
 }
 static DEVICE_ATTR(companion, 0644, show_companion, store_companion);
 
-static inline void create_companion_file(struct ehci_hcd *ehci)
+static inline int create_companion_file(struct ehci_hcd *ehci)
 {
-       int     i;
+       int     i = 0;
 
        /* with integrated TT there is no companion! */
        if (!ehci_is_TDI(ehci))
                i = device_create_file(ehci_to_hcd(ehci)->self.controller,
                                       &dev_attr_companion);
+       return i;
 }
 
 static inline void remove_companion_file(struct ehci_hcd *ehci)