[IA64] Take defensive stance on ia64_pal_get_brand_info()

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / setup.c

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index be398451d45cf31fb8d18655fb70d839bb7f640d..ad567b8d432e6552bea031db3fe5d55c8c174c54 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -674,6 +674,7 @@ get_model_name(__u8 family, __u8 model)
 {
        char brand[128];
 
+       memcpy(brand, "Unknown", 8);
        if (ia64_pal_get_brand_info(brand)) {
                if (family == 0x7)
                        memcpy(brand, "Merced", 7);
@@ -681,8 +682,7 @@ get_model_name(__u8 family, __u8 model)
                        case 0: memcpy(brand, "McKinley", 9); break;
                        case 1: memcpy(brand, "Madison", 8); break;
                        case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
-               } else
-                       memcpy(brand, "Unknown", 8);
+               }
        }
        if (brandname[0] == '\0')
                return strcpy(brandname, brand);