diff options
| author |   Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-06-07 11:10:32 -0700 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-06-13 16:37:25 -0700 |
| commit | e25e62aecac42379e113c63a674a86ae3ebbec8d (patch) | |
| tree | 8f2a448e314790ff1f65644f0bc84f140badb9cb /drivers/usb | |
| parent | USB: Checking the wrong variable in usb_disable_lpm() (diff) | |
| download | linux-dev-e25e62aecac42379e113c63a674a86ae3ebbec8d.tar.xz linux-dev-e25e62aecac42379e113c63a674a86ae3ebbec8d.zip | |
xhci: Fix error path return value.
This patch fixes an issue discovered by Dan Carpenter:
The patch 3b3db026414b: "xhci: Add infrastructure for host-specific
LPM policies." from May 9, 2012, leads to the following warning:
drivers/usb/host/xhci.c:3909 xhci_get_timeout_no_hub_lpm()
warn: signedness bug returning '-22'
3906 default:
3907 dev_warn(&udev->dev, "%s: Can't get timeout for non-U1 or U2 state.\n",
3908 __func__);
3909 return -EINVAL;
^^^^^^^^^^^^^^
This should be a u16 like USB3_LPM_DISABLED or something.
3910 }
3911
3912 if (sel <= max_sel_pel && pel <= max_sel_pel)
3913 return USB3_LPM_DEVICE_INITIATED;
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/xhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index afdc73ee84a6..1d4958f7f007 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -3906,7 +3906,7 @@ static u16 xhci_get_timeout_no_hub_lpm(struct usb_device *udev, default: dev_warn(&udev->dev, "%s: Can't get timeout for non-U1 or U2 state.\n", __func__); - return -EINVAL; + return USB3_LPM_DISABLED; } if (sel <= max_sel_pel && pel <= max_sel_pel) |