diff options
| author | NeilBrown <neilb@suse.com> | 2015-09-05 11:07:04 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-09-05 11:08:32 +0200 |
| commit | e89c6fdf9e0eb1b5a03574d4ca73e83eae8deb91 (patch) | |
| tree | f9df292ed03a5a3c4ddc658ae3646f02a1ffafce /drivers/leds/leds-syscon.c | |
| parent | c3cce6cda162eb2b2960a85d9c8992f4f3be85d0 (diff) | |
| parent | 1081230b748de8f03f37f80c53dfa89feda9b8de (diff) | |
Merge linux-block/for-4.3/core into md/for-linux
There were a few conflicts that are fairly easy to resolve.
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/leds/leds-syscon.c')
| -rw-r--r-- | drivers/leds/leds-syscon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/leds/leds-syscon.c b/drivers/leds/leds-syscon.c index d1660b039812..b88900d721e4 100644 --- a/drivers/leds/leds-syscon.c +++ b/drivers/leds/leds-syscon.c @@ -83,9 +83,9 @@ static int syscon_led_probe(struct platform_device *pdev) return -ENODEV; } map = syscon_node_to_regmap(parent->of_node); - if (!map) { + if (IS_ERR(map)) { dev_err(dev, "no regmap for syscon LED parent\n"); - return -ENODEV; + return PTR_ERR(map); } sled = devm_kzalloc(dev, sizeof(*sled), GFP_KERNEL); |