From f5a14927d09ff9dff4229da1f6cfc7dbb9ca98d5 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Wed, 25 Jan 2012 15:18:58 +0100 Subject: [PATCH] --- yaml --- r: 289575 b: refs/heads/master c: 20edfbb6a17f3007c1905e9849d8d306e318883b h: refs/heads/master i: 289573: 68c29528f44135dbe5f016b20099e82564adb34a 289571: 415f24f63cbb4461e298f3551a31c9447e19ffce 289567: 0748a2de7437e753d9ea8f414980deb686f66a53 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/dummy_hcd.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ccc87b6b795..b890f170c073 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cf0ad02e42a91e85ffe9bd67422dd266531d3ec +refs/heads/master: 20edfbb6a17f3007c1905e9849d8d306e318883b diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c index 9170a4c7ced4..8cc1a88d21e7 100644 --- a/trunk/drivers/usb/gadget/dummy_hcd.c +++ b/trunk/drivers/usb/gadget/dummy_hcd.c @@ -599,8 +599,10 @@ static void dummy_free_request(struct usb_ep *_ep, struct usb_request *_req) struct dummy_ep *ep; struct dummy_request *req; + if (!_ep || !_req) + return; ep = usb_ep_to_dummy_ep(_ep); - if (!ep || !_req || (!ep->desc && _ep->name != ep0name)) + if (!ep->desc && _ep->name != ep0name) return; req = usb_request_to_dummy_request(_req);