diff --git a/[refs] b/[refs] index 76784aa04817..406a179e80f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdf6e6390a567963e302a62ef676dd648d11661c +refs/heads/master: 72688dc95afcb42f4d5e8762f8790144cec9a280 diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c index 83bb2e3fa861..b799106027ad 100644 --- a/trunk/drivers/usb/gadget/dummy_hcd.c +++ b/trunk/drivers/usb/gadget/dummy_hcd.c @@ -598,7 +598,7 @@ static void dummy_free_request(struct usb_ep *_ep, struct usb_request *_req) struct dummy_request *req; if (!_ep || !_req) { - __WARN(); + WARN_ON(1); return; }