From: Nicolas Pitre <nico@cam.org>
Date: Fri, 13 May 2005 00:18:19 +0000 (-0400)
Subject:   [PATCH] smc91x addr config check
X-Git-Tag: v2.6.14-rc2~49^2~36^2~53^2~2^2~3
X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=53155109b6ac611d9bb4a4ef9d3109b219b8d0e1;p=linux-2.6-omap-h63xx.git

  [PATCH] smc91x addr config check

  The PAGE_SIZE mask is indeed confusing.  Use the exact mask for
  this context which has nothing to do with memory pages at all.
  Also cast to int since the value to compare with is an int.

  Signed-off-by: Nicolas Pitre <nico@cam.org>
  Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 5e561ba4433..1e2b860dab2 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1863,7 +1863,7 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
 	SMC_SELECT_BANK(1);
 	val = SMC_GET_BASE();
 	val = ((val & 0x1F00) >> 3) << SMC_IO_SHIFT;
-	if (((unsigned long)ioaddr & ((PAGE_SIZE-1)<<SMC_IO_SHIFT)) != val) { /*XXX: WTF? */
+	if (((unsigned int)ioaddr & (0x3e0 << SMC_IO_SHIFT)) != val) {
 		printk("%s: IOADDR %p doesn't match configuration (%x).\n",
 			CARDNAME, ioaddr, val);
 	}