diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | fa93e4fb602389c5a5d6991a86cf93ae6e92d016 (patch) | |
| tree | 570dc8a12e7410fb1f87ddb473ad5a5e64240846 /arch/arm/mach-zynq/clk-zynq7000.c | |
| parent | 52a0febb3dbe06e233f04d5c670fd662b85c1d95 (diff) | |
| parent | d5a82eb095def58f3a19127bb08ff96d799b63a5 (diff) | |
| download | barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.gz barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.xz | |
Merge branch 'for-next/resource-err-ptr'
Diffstat (limited to 'arch/arm/mach-zynq/clk-zynq7000.c')
| -rw-r--r-- | arch/arm/mach-zynq/clk-zynq7000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/clk-zynq7000.c b/arch/arm/mach-zynq/clk-zynq7000.c index b4513a9a7a..2b9260ba1d 100644 --- a/arch/arm/mach-zynq/clk-zynq7000.c +++ b/arch/arm/mach-zynq/clk-zynq7000.c @@ -363,8 +363,8 @@ static int zynq_clock_probe(struct device_d *dev) unsigned long ps_clk_rate = 33333330; slcr_base = dev_request_mem_region(dev, 0); - if (!slcr_base) - return -EBUSY; + if (IS_ERR(slcr_base)) + return PTR_ERR(slcr_base); clks[ps_clk] = clk_fixed("ps_clk", ps_clk_rate); |