---

yaml --- r: 235297 b: refs/heads/master c: ac8d674 h: refs/heads/master i: 235295: f8f4199 v: v3
git-mirror · Feb 4, 2011 · b561aff · b561aff
1 parent 7da29f7
commit b561aff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb34a90861a290cd271f4b887c0d59070e1b69b0
+refs/heads/master: ac8d67417816fa7c568b24a8f2891eb02e6d0462
diff --git a/trunk/drivers/usb/host/ehci-hub.c b/trunk/drivers/usb/host/ehci-hub.c
@@ -531,14 +531,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)