From b036a055e192cd1e8e98c8612524cc5a106e4d1c Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Thu, 10 Mar 2016 21:51:03 +0900 Subject: [PATCH] usb: echi: use _min3 instead of min3 Change-Id: I0c84580022b8a8d4bd406f3a24cbc2062b90bd28 Signed-off-by: Chanho Park --- drivers/usb/host/ehci-hcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index da3c7d97f..ebcc73234 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -582,7 +582,7 @@ fail: return -1; } -static inline int min3(int a, int b, int c) +static inline int _min3(int a, int b, int c) { if (b < a) @@ -828,7 +828,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, } mdelay(1); - len = min3(srclen, le16_to_cpu(req->length), length); + len = _min3(srclen, le16_to_cpu(req->length), length); if (srcptr != NULL && len > 0) memcpy(buffer, srcptr, len); else -- 2.34.1