From b561aff027a605f37de14cc558ee2c88d4492a25 Mon Sep 17 00:00:00 2001 From: David Daney Date: Tue, 25 Jan 2011 09:59:37 -0800 Subject: [PATCH] --- yaml --- r: 235297 b: refs/heads/master c: ac8d67417816fa7c568b24a8f2891eb02e6d0462 h: refs/heads/master i: 235295: f8f4199e265c253812b710dda74540b48d4f41c2 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-hub.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 709b17355e4e..b33172c35d29 100644 --- 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 index 796ea0c8900f..5aa6c4947325 100644 --- 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)