linux-mips
[Top] [All Lists]

[PATCH] MIPS: Alchemy: fix xxs1500 build error

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH] MIPS: Alchemy: fix xxs1500 build error
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Sat, 7 May 2011 13:55:19 +0200
Cc: Linux-MIPS <linux-mips@linux-mips.org>, Manuel Lauss <manuel.lauss@googlemail.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=zZF7hPuU7OmnsMqFzib2JJZR586yYS6AhuT11zMUwIw=; b=cSkdjoh0SGeJEN9SCwdYBCAfsyj8w568fyKqfHlFKE+HBBXv5un+R7uDtbU9iq5U56 L5OGUT+C3OmdZmkANlC83WsLEPzc3dauZv5c9FgfYY87Uh9XPJRX4o+C88D96N/mXBex LQO/fL4OQEWPKTNzECl7zFbkkQvMky55Omh2w=
Domainkey-signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=u6Hd3O0Ca0RqKJJhvbrqlznYXyv3GqnIvOj2GGam7wkQ9v9eWpTVn22/+Ywz2ed4uz k58BS2EwWlIMirbxLTci6b67O6KRko29v8YFoOCdlTxPYUg25uF7/+jkQQ0lF+ZZt5OB Z3xSuBcfUdXy4cOnEVRdDbXKBLHK4NwCIbH4w=
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
This fixes:
alchemy/xxs1500/init.c: In function 'prom_init':
alchemy/xxs1500/init.c:57:17: error: ignoring return value of 'kstrtoul', 
declared with attribute warn_unused_result

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
---
 arch/mips/alchemy/xxs1500/init.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/mips/alchemy/xxs1500/init.c b/arch/mips/alchemy/xxs1500/init.c
index 0bf768f..0ee02cf 100644
--- a/arch/mips/alchemy/xxs1500/init.c
+++ b/arch/mips/alchemy/xxs1500/init.c
@@ -51,10 +51,9 @@ void __init prom_init(void)
        prom_init_cmdline();
 
        memsize_str = prom_getenv("memsize");
-       if (!memsize_str)
+       if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize))
                memsize = 0x04000000;
-       else
-               strict_strtoul(memsize_str, 0, &memsize);
+
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
 
-- 
1.7.5.rc3


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] MIPS: Alchemy: fix xxs1500 build error, Manuel Lauss <=