From 517b1de9ddab8ecec74726897b18d7af3e4e7405 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Wed, 12 Dec 2012 01:24:54 +0100 Subject: [PATCH] --- yaml --- r: 347287 b: refs/heads/master c: d3601e56cf64a3f2df6f6380cccb3644274406e2 h: refs/heads/master i: 347285: 6c76f77c2855e2bb615b2b3468a3f37873528364 347283: 9aad839b8ea6cb196abf12bf0d53b85b5a92bd9a 347279: bfc1b8b82d68e31fc777f07cde6ad59ea59fc3a4 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-sh-hspi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3615e1781a5e..1029fab27985 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a79131318dd6f71ec46e0af1daa581e695fd5ab +refs/heads/master: d3601e56cf64a3f2df6f6380cccb3644274406e2 diff --git a/trunk/drivers/spi/spi-sh-hspi.c b/trunk/drivers/spi/spi-sh-hspi.c index 32f7b55fce09..60cfae51c713 100644 --- a/trunk/drivers/spi/spi-sh-hspi.c +++ b/trunk/drivers/spi/spi-sh-hspi.c @@ -290,7 +290,7 @@ static int hspi_probe(struct platform_device *pdev) } clk = clk_get(NULL, "shyway_clk"); - if (!clk) { + if (IS_ERR(clk)) { dev_err(&pdev->dev, "shyway_clk is required\n"); ret = -EINVAL; goto error0;