diff options
| author | Michal Nazarewicz | 2010-02-03 11:37:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-03-02 14:54:54 -0800 |
| commit | d7e18a9f2c506467ec7a9c066da45a0f60c6f5a6 (patch) | |
| tree | 882516094abdf6a87464b34ef546ae1c55bff5d1 | |
| parent | 08e6c972da616d057b63fd3f89ce0eb539952f06 (diff) | |
USB: g_mass_storage: min(...) warning fixed
This patch fixes warning caused by calling min() macro
with arguments of different types:
drivers/usb/gadget/f_mass_storage.c:623: warning: \
comparison of distinct pointer types lacks a cast
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
Cc: Marek Szyprowski <m.nazarewicz@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 3c835503ffb1..0553d9a5536b 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -620,7 +620,7 @@ static int fsg_setup(struct usb_function *f, *(u8 *) req->buf = fsg->common->nluns - 1; /* Respond with data/status */ - req->length = min(1, w_length); + req->length = min((u16)1, w_length); fsg->common->ep0req_name = ctrl->bRequestType & USB_DIR_IN ? "ep0-in" : "ep0-out"; return ep0_queue(fsg->common); |