---

yaml --- r: 102216 b: refs/heads/master c: ea90130 h: refs/heads/master v: v3
git-mirror · Jul 15, 2008 · 9ee3503 · 9ee3503
1 parent 24ef8b2
commit 9ee3503
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62a7573ee9f31d4fdb330b3e68ebf6efaba1d57c
+refs/heads/master: ea901300cd8b809285fa5cbced18124f127e0ac6
diff --git a/trunk/drivers/mmc/core/sdio_io.c b/trunk/drivers/mmc/core/sdio_io.c
@@ -187,11 +187,10 @@ EXPORT_SYMBOL_GPL(sdio_set_block_size);
  */
 static inline unsigned int sdio_max_byte_size(struct sdio_func *func)
 {
-	return min(min(min(
-		func->card->host->max_seg_size,
-		func->card->host->max_blk_size),
-		func->max_blksize),
-		512u); /* maximum size for byte mode */
+	unsigned mval =	min(func->card->host->max_seg_size,
+			    func->card->host->max_blk_size);
+	mval = min(mval, func->max_blksize);
+	return min(mval, 512u); /* maximum size for byte mode */
 }
 
 /**