From 50f7d373126e856c23204196eeb955371e95c6fb Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Thu, 11 Oct 2007 01:06:03 -0400
Subject: [PATCH] --- yaml --- r: 65657 b: refs/heads/master c:
 019a5f56ec195aceadada18aaaad0f67294bdaef h: refs/heads/master i:   65655:
 c47e727c7284c3c608c31015a6b2b64c45d408cc v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mmc/host/mmci.c    | 3 ++-
 trunk/drivers/mmc/host/tifm_sd.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 228a3dee81bd..896ac89be05d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c783837bc69dd0f329a441c1704f5a02d01d1bd5
+refs/heads/master: 019a5f56ec195aceadada18aaaad0f67294bdaef
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index 4a72772f4fe4..d0eb0a2abf4d 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/highmem.h>
+#include <linux/log2.h>
 #include <linux/mmc/host.h>
 #include <linux/amba/bus.h>
 #include <linux/clk.h>
@@ -391,7 +392,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
 	WARN_ON(host->mrq != NULL);
 
-	if (mrq->data && (hweight32(mrq->data->blksz) > 1)) {
+	if (mrq->data && !is_power_of_2(mrq->data->blksz)) {
 		printk(KERN_ERR "%s: Unsupported block size (%d bytes)\n",
 			mmc_hostname(mmc), mrq->data->blksz);
 		mrq->cmd->error = -EINVAL;
diff --git a/trunk/drivers/mmc/host/tifm_sd.c b/trunk/drivers/mmc/host/tifm_sd.c
index 951392d2ce37..9b904795eb77 100644
--- a/trunk/drivers/mmc/host/tifm_sd.c
+++ b/trunk/drivers/mmc/host/tifm_sd.c
@@ -16,6 +16,7 @@
 #include <linux/mmc/host.h>
 #include <linux/highmem.h>
 #include <linux/scatterlist.h>
+#include <linux/log2.h>
 #include <asm/io.h>
 
 #define DRIVER_NAME "tifm_sd"
@@ -637,7 +638,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
 		goto err_out;
 	}
 
-	if (mrq->data && (hweight32(mrq->data->blksz) > 1)) {
+	if (mrq->data && !is_power_of_2(mrq->data->blksz)) {
 		printk(KERN_ERR "%s: Unsupported block size (%d bytes)\n",
 			sock->dev.bus_id, mrq->data->blksz);
 		mrq->cmd->error = -EINVAL;