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@xxxxxxxxxxxxxxx > Signed-off-by: Jamie Iles <jamie@xxxxxxxxxxxxx> > --- > 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@xxxxxxxxxx> <http://printf.net/> One Laptop Per Child -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html