From patchwork Sat Mar 19 04:39:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 87600 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E31A5B6F74 for ; Sat, 19 Mar 2011 15:39:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752468Ab1CSEjf (ORCPT ); Sat, 19 Mar 2011 00:39:35 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:62056 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750938Ab1CSEje (ORCPT ); Sat, 19 Mar 2011 00:39:34 -0400 Received: by wwa36 with SMTP id 36so5604167wwa.1 for ; Fri, 18 Mar 2011 21:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=W5yqF3plG1CNdwaqn5Ws7GQ8eT+0bk8sWlPLwz1nFTE=; b=eXyLlgipuny5ShUmOOV8sVdWMCu1EK7THKLUuuEqoI4AUwnGhMvwQ+ZD+5tcGO0rqv 7GrwMnOReoY3xZifn4qzYRES5c0zutKMbuBRfdH+vXGeeWiZKOBejvlYy6HMSA6WaAUa 7gfJaMb6hiUzkTBb1xRwq6coypp+OZyJBvViU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=lRau46qhJwbp/Ps+RnPJRBhRHTc4/YnktwZmDI2nyxnecfIS3HGSw7cC/p5+SqW5oy AxS/1iiSeflSBK7p86ptWny3kTk/Exns4kYzSQgaMpupLpfSg3jJedKERDqx6cHb158K mG4JX+dgnSKM023yTnDVL9E5Jfk/pYe/VlyTA= Received: by 10.216.254.39 with SMTP id g39mr1733052wes.108.1300509572800; Fri, 18 Mar 2011 21:39:32 -0700 (PDT) Received: from bicker ([212.49.88.34]) by mx.google.com with ESMTPS id o23sm1680537wbc.10.2011.03.18.21.39.26 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 Mar 2011 21:39:31 -0700 (PDT) Date: Sat, 19 Mar 2011 07:39:15 +0300 From: Dan Carpenter To: Po-Yu Chuang Cc: Eric Dumazet , "David S. Miller" , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] ftmac100: use resource_size() Message-ID: <20110319043915.GB2008@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The calculation is off-by-one. It should be "end - start + 1". This patch fixes it to use resource_size() instead. Oddly, the code already uses resource size correctly a couple lines earlier when it calls request_mem_region() for this memory. Signed-off-by: Dan Carpenter --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 1d6f4b8..a316619 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -1102,7 +1102,7 @@ static int ftmac100_probe(struct platform_device *pdev) goto err_req_mem; } - priv->base = ioremap(res->start, res->end - res->start); + priv->base = ioremap(res->start, resource_size(res)); if (!priv->base) { dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n"); err = -EIO;