From c444c2f1189758134a1a1d2331510df0f7c5122f Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Thu, 28 Feb 2008 09:48:10 -0800 Subject: [PATCH] --- yaml --- r: 87105 b: refs/heads/master c: ef82710a3f80cd24d459c508f91542ecccb1f340 h: refs/heads/master i: 87103: 44e324df65e3df38c1936cf23d0a4467a778a675 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/hpwdt.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 25871c3c347f..24606e10c161 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 103018aca2e4ba0d0e230efa864231c59228f419 +refs/heads/master: ef82710a3f80cd24d459c508f91542ecccb1f340 diff --git a/trunk/drivers/watchdog/hpwdt.c b/trunk/drivers/watchdog/hpwdt.c index cd1cc2dacee7..b1cd0aca9b3c 100644 --- a/trunk/drivers/watchdog/hpwdt.c +++ b/trunk/drivers/watchdog/hpwdt.c @@ -528,20 +528,19 @@ static int __devinit smbios_present(const char __iomem *p) return -ENODEV; } -static int __devinit smbios_scan_machine(void) +static void __devinit smbios_scan_machine(void) { char __iomem *p, *q; - int rc; if (efi_enabled) { if (efi.smbios == EFI_INVALID_TABLE_ADDR) - return -ENODEV; + return; p = ioremap(efi.smbios, 32); if (p == NULL) - return -ENOMEM; + return; - rc = smbios_present(p); + smbios_present(p); iounmap(p); } else { /* @@ -549,14 +548,12 @@ static int __devinit smbios_scan_machine(void) */ p = ioremap(PCI_ROM_BASE1, ROM_SIZE); if (p == NULL) - return -ENOMEM; + return; - for (q = p; q < p + ROM_SIZE; q += 16) { - rc = smbios_present(q); - if (!rc) { + for (q = p; q < p + ROM_SIZE; q += 16) + if (!smbios_present(q)) break; - } - } + iounmap(p); } }