aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdrivers/mmc/core/sdio_io.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c
index 0888df64581f..f61fc2d4cd0a 100755
--- a/drivers/mmc/core/sdio_io.c
+++ b/drivers/mmc/core/sdio_io.c
@@ -187,11 +187,10 @@ EXPORT_SYMBOL_GPL(sdio_set_block_size);
187 */ 187 */
188static inline unsigned int sdio_max_byte_size(struct sdio_func *func) 188static inline unsigned int sdio_max_byte_size(struct sdio_func *func)
189{ 189{
190 return min(min(min( 190 unsigned mval = min(func->card->host->max_seg_size,
191 func->card->host->max_seg_size, 191 func->card->host->max_blk_size);
192 func->card->host->max_blk_size), 192 mval = min(mval, func->max_blksize);
193 func->max_blksize), 193 return min(mval, 512u); /* maximum size for byte mode */
194 512u); /* maximum size for byte mode */
195} 194}
196 195
197/** 196/**