diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
| commit | 90f959bcb386da2c71613dcefc6a285e054a539e (patch) | |
| tree | ee3e9dd4111d4aad12e579cb0c2c159114dff263 /drivers/usb/gadget/dummy_hcd.c | |
| parent | 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
Diffstat (limited to 'drivers/usb/gadget/dummy_hcd.c')
| -rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 9064696636a..a56b24d305f 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c @@ -1437,7 +1437,7 @@ restart: } if (urb->transfer_buffer_length > 1) buf [1] = 0; - urb->actual_length = min (2, + urb->actual_length = min_t(u32, 2, urb->transfer_buffer_length); value = 0; status = 0; @@ -1626,7 +1626,7 @@ static int dummy_hub_control ( hub_descriptor ((struct usb_hub_descriptor *) buf); break; case GetHubStatus: - *(__le32 *) buf = __constant_cpu_to_le32 (0); + *(__le32 *) buf = cpu_to_le32 (0); break; case GetPortStatus: if (wIndex != 1) |