Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3119cbda authored by Jamie Iles's avatar Jamie Iles Committed by Chris Ball
Browse files

mmc: jz4740: don't treat NULL clk as an error 



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.

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 9047b435

drivers/mmc/host/jz4740_mmc.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

	}