Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b684cd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: sbc_fitpc2_wdt, fix crash on systems without DMI_BOARD_NAME
parents 1b7e7e6f d4065775

drivers/watchdog/sbc_fitpc2_wdt.c

+5 −2
Original line number Diff line number Diff line
@@ -201,11 +201,14 @@ static struct miscdevice fitpc2_wdt_miscdev = { 
static int __init fitpc2_wdt_init(void)

{

	int err;

	const char *brd_name;



	if (!strstr(dmi_get_system_info(DMI_BOARD_NAME), "SBC-FITPC2"))

	brd_name = dmi_get_system_info(DMI_BOARD_NAME);



	if (!brd_name || !strstr(brd_name, "SBC-FITPC2"))

		return -ENODEV;



	pr_info("%s found\n", dmi_get_system_info(DMI_BOARD_NAME));

	pr_info("%s found\n", brd_name);



	if (!request_region(COMMAND_PORT, 1, WATCHDOG_NAME)) {

		pr_err("I/O address 0x%04x already in use\n", COMMAND_PORT);