Skip to content

L
linux
Commit 3069353b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

[PATCH] USB: fix devio compiler warnings created by previous patch.

parent 85d0f7fa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/usb/core/devio.c
View file @ 3069353b
...@@ -875,7 +875,7 @@ static int proc_submiturb(struct dev_state *ps, void __user *arg) ...@@ -875,7 +875,7 @@ static int proc_submiturb(struct dev_state *ps, void __user *arg)
return -EINVAL; return -EINVAL;
if (!(ep_desc = usb_epnum_to_ep_desc(ps->dev, uurb.endpoint))) if (!(ep_desc = usb_epnum_to_ep_desc(ps->dev, uurb.endpoint)))
return -ENOENT; return -ENOENT;
interval = 1 << min ((u8)15, ep_desc->bInterval - 1); interval = 1 << min (15, ep_desc->bInterval - 1);
isofrmlen = sizeof(struct usbdevfs_iso_packet_desc) * uurb.number_of_packets; isofrmlen = sizeof(struct usbdevfs_iso_packet_desc) * uurb.number_of_packets;
if (!(isopkt = kmalloc(isofrmlen, GFP_KERNEL))) if (!(isopkt = kmalloc(isofrmlen, GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
...@@ -902,7 +902,7 @@ static int proc_submiturb(struct dev_state *ps, void __user *arg) ...@@ -902,7 +902,7 @@ static int proc_submiturb(struct dev_state *ps, void __user *arg)
if (!(ep_desc = usb_epnum_to_ep_desc(ps->dev, uurb.endpoint))) if (!(ep_desc = usb_epnum_to_ep_desc(ps->dev, uurb.endpoint)))
return -ENOENT; return -ENOENT;
if (ps->dev->speed == USB_SPEED_HIGH) if (ps->dev->speed == USB_SPEED_HIGH)
interval = 1 << min ((u8)15, ep_desc->bInterval - 1); interval = 1 << min (15, ep_desc->bInterval - 1);
else else
interval = ep_desc->bInterval; interval = ep_desc->bInterval;
if (uurb.buffer_length > 16384) if (uurb.buffer_length > 16384)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7