projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20190726-2' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
drivers
/
watchdog
/
loongson1_wdt.c
diff --git
a/drivers/watchdog/loongson1_wdt.c
b/drivers/watchdog/loongson1_wdt.c
index
c8c2b8a
..
bb3d075
100644
(file)
--- a/
drivers/watchdog/loongson1_wdt.c
+++ b/
drivers/watchdog/loongson1_wdt.c
@@
-132,10
+132,8
@@
static int ls1x_wdt_probe(struct platform_device *pdev)
watchdog_set_drvdata(ls1x_wdt, drvdata);
err = devm_watchdog_register_device(dev, &drvdata->wdt);
- if (err) {
- dev_err(dev, "failed to register watchdog device\n");
+ if (err)
return err;
- }
platform_set_drvdata(pdev, drvdata);