diff --git a/[refs] b/[refs] index d92bb3e1f68a..558e6acffca6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8356f3113d2628c98a58180ca183345474a9d011 +refs/heads/master: d1bbb60007597b920beca72cd0b413d10290310a diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index b5c226a87ed8..a8e8d1ecebb1 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -935,7 +935,7 @@ struct usb_iso_packet_descriptor { unsigned int offset; unsigned int length; /* expected length */ unsigned int actual_length; - unsigned int status; + int status; }; struct urb;