summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/sdio.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2016-09-08 16:10:50 +0200
committerGreg Kroah-Hartman2016-09-19 16:44:41 +0200
commit7434564ca130552f3f873d0a7e87286a16890c32 (patch)
tree7a775988c722b0ca890f366186128849f05d77c8 /drivers/staging/greybus/sdio.c
parentstaging: greybus: spi: remove KERNEL_VERSION checks (diff)
downloadkernel-qcow2-linux-7434564ca130552f3f873d0a7e87286a16890c32.tar.gz
kernel-qcow2-linux-7434564ca130552f3f873d0a7e87286a16890c32.tar.xz
kernel-qcow2-linux-7434564ca130552f3f873d0a7e87286a16890c32.zip
staging: greybus: sdio: fix min() type check
The 0-day bot pointed out a type difference in one min() call, so fix it up by being explicit about the type being compared. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/sdio.c')
-rw-r--r--drivers/staging/greybus/sdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c
index a78d9e4a0321..99b997904edd 100644
--- a/drivers/staging/greybus/sdio.c
+++ b/drivers/staging/greybus/sdio.c
@@ -136,7 +136,7 @@ static int gb_sdio_get_caps(struct gb_sdio_host *host)
data_max = min(data_max - sizeof(struct gb_sdio_transfer_request),
data_max - sizeof(struct gb_sdio_transfer_response));
- blksz = min(le16_to_cpu(response.max_blk_size), data_max);
+ blksz = min_t(u16, le16_to_cpu(response.max_blk_size), data_max);
blksz = max_t(u32, 512, blksz);
mmc->max_blk_size = rounddown_pow_of_two(blksz);