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 /drivers/clocksource/bcm2835.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 'drivers/clocksource/bcm2835.c')
| -rw-r--r-- | drivers/clocksource/bcm2835.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clocksource/bcm2835.c b/drivers/clocksource/bcm2835.c index d1df3d2b2e..c0b1aae46b 100644 --- a/drivers/clocksource/bcm2835.c +++ b/drivers/clocksource/bcm2835.c @@ -62,6 +62,8 @@ static int bcm2835_cs_probe(struct device_d *dev) rate = clk_get_rate(stc_clk); stc_base = dev_request_mem_region(dev, 0); + if (IS_ERR(stc_base)) + return PTR_ERR(stc_base); clocks_calc_mult_shift(&bcm2835_stc.mult, &bcm2835_stc.shift, rate, NSEC_PER_SEC, 60); init_clock(&bcm2835_stc); |