* [PATCH 13/16] MMC: jz4740: don't treat NULL clk as an error [not found] <1294749833-32019-1-git-send-email-jamie@jamieiles.com> @ 2011-01-11 12:43 ` Jamie Iles 2011-01-11 23:22 ` Chris Ball 0 siblings, 1 reply; 2+ messages in thread From: Jamie Iles @ 2011-01-11 12:43 UTC (permalink / raw) To: linux-kernel; +Cc: Jamie Iles, linux-mmc clk_get() returns a struct clk cookie to the driver and some platforms may return NULL if they only support a single clock. clk_get() has only failed if it returns a ERR_PTR() encoded pointer. Cc: linux-mmc@vger.kernel.org Signed-off-by: Jamie Iles <jamie@jamieiles.com> --- drivers/mmc/host/jz4740_mmc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index b3a0ab0..74218ad 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -14,6 +14,7 @@ */ #include <linux/mmc/host.h> +#include <linux/err.h> #include <linux/io.h> #include <linux/irq.h> #include <linux/interrupt.h> @@ -827,8 +828,8 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev) } host->clk = clk_get(&pdev->dev, "mmc"); - if (!host->clk) { - ret = -ENOENT; + if (IS_ERR(host->clk)) { + ret = PTR_ERR(host->clk); dev_err(&pdev->dev, "Failed to get mmc clock\n"); goto err_free_host; } -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 13/16] MMC: jz4740: don't treat NULL clk as an error 2011-01-11 12:43 ` [PATCH 13/16] MMC: jz4740: don't treat NULL clk as an error Jamie Iles @ 2011-01-11 23:22 ` Chris Ball 0 siblings, 0 replies; 2+ messages in thread From: Chris Ball @ 2011-01-11 23:22 UTC (permalink / raw) To: Jamie Iles; +Cc: linux-kernel, linux-mmc Hi Jamie, On Tue, Jan 11, 2011 at 12:43:50PM +0000, Jamie Iles wrote: > clk_get() returns a struct clk cookie to the driver and some platforms > may return NULL if they only support a single clock. clk_get() has only > failed if it returns a ERR_PTR() encoded pointer. > > Cc: linux-mmc@vger.kernel.org > Signed-off-by: Jamie Iles <jamie@jamieiles.com> > --- > drivers/mmc/host/jz4740_mmc.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c > index b3a0ab0..74218ad 100644 > --- a/drivers/mmc/host/jz4740_mmc.c > +++ b/drivers/mmc/host/jz4740_mmc.c > @@ -14,6 +14,7 @@ > */ > > #include <linux/mmc/host.h> > +#include <linux/err.h> > #include <linux/io.h> > #include <linux/irq.h> > #include <linux/interrupt.h> > @@ -827,8 +828,8 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev) > } > > host->clk = clk_get(&pdev->dev, "mmc"); > - if (!host->clk) { > - ret = -ENOENT; > + if (IS_ERR(host->clk)) { > + ret = PTR_ERR(host->clk); > dev_err(&pdev->dev, "Failed to get mmc clock\n"); > goto err_free_host; > } Thanks, pushed to mmc-next and queued as a .38 fix. -- Chris Ball <cjb@laptop.org> <http://printf.net/> One Laptop Per Child ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-11 23:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1294749833-32019-1-git-send-email-jamie@jamieiles.com>
2011-01-11 12:43 ` [PATCH 13/16] MMC: jz4740: don't treat NULL clk as an error Jamie Iles
2011-01-11 23:22 ` Chris Ball
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox