tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'linux-watchdog-5.0-rc-fixes' of git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:

- mt7621_wdt/rt2880_wdt: Fix compilation problem

- tqmx86: Fix a couple IS_ERR() vs NULL bugs

* tag 'linux-watchdog-5.0-rc-fixes' of git://www.linux-watchdog.org/linux-watchdog:
watchdog: tqmx86: Fix a couple IS_ERR() vs NULL bugs
watchdog: mt7621_wdt/rt2880_wdt: Fix compilation problem

Linus Torvalds f403d718 b0efca46

+6 -4
+1
drivers/watchdog/mt7621_wdt.c
··· 17 17 #include <linux/watchdog.h> 18 18 #include <linux/moduleparam.h> 19 19 #include <linux/platform_device.h> 20 + #include <linux/mod_devicetable.h> 20 21 21 22 #include <asm/mach-ralink/ralink_regs.h> 22 23
+1
drivers/watchdog/rt2880_wdt.c
··· 18 18 #include <linux/watchdog.h> 19 19 #include <linux/moduleparam.h> 20 20 #include <linux/platform_device.h> 21 + #include <linux/mod_devicetable.h> 21 22 22 23 #include <asm/mach-ralink/ralink_regs.h> 23 24
+4 -4
drivers/watchdog/tqmx86_wdt.c
··· 79 79 return -ENOMEM; 80 80 81 81 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 82 - if (IS_ERR(res)) 83 - return PTR_ERR(res); 82 + if (!res) 83 + return -ENODEV; 84 84 85 85 priv->io_base = devm_ioport_map(&pdev->dev, res->start, 86 86 resource_size(res)); 87 - if (IS_ERR(priv->io_base)) 88 - return PTR_ERR(priv->io_base); 87 + if (!priv->io_base) 88 + return -ENOMEM; 89 89 90 90 watchdog_set_drvdata(&priv->wdd, priv); 91 91