Commit f403d718 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b0efca46 4a22fc53

drivers/watchdog/mt7621_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/watchdog.h>

#include <linux/moduleparam.h>

#include <linux/platform_device.h>

#include <linux/mod_devicetable.h>



#include <asm/mach-ralink/ralink_regs.h>

drivers/watchdog/rt2880_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/watchdog.h>

#include <linux/moduleparam.h>

#include <linux/platform_device.h>

#include <linux/mod_devicetable.h>



#include <asm/mach-ralink/ralink_regs.h>

drivers/watchdog/tqmx86_wdt.c

+4 −4
Original line number Diff line number Diff line
@@ -79,13 +79,13 @@ static int tqmx86_wdt_probe(struct platform_device *pdev) 
		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_IO, 0);

	if (IS_ERR(res))

		return PTR_ERR(res);

	if (!res)

		return -ENODEV;



	priv->io_base = devm_ioport_map(&pdev->dev, res->start,

					resource_size(res));

	if (IS_ERR(priv->io_base))

		return PTR_ERR(priv->io_base);

	if (!priv->io_base)

		return -ENOMEM;



	watchdog_set_drvdata(&priv->wdd, priv);