diff options
| -rw-r--r-- | arch/ia64/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index be398451d45c..ad567b8d432e 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -674,6 +674,7 @@ get_model_name(__u8 family, __u8 model) | |||
| 674 | { | 674 | { |
| 675 | char brand[128]; | 675 | char brand[128]; |
| 676 | 676 | ||
| 677 | memcpy(brand, "Unknown", 8); | ||
| 677 | if (ia64_pal_get_brand_info(brand)) { | 678 | if (ia64_pal_get_brand_info(brand)) { |
| 678 | if (family == 0x7) | 679 | if (family == 0x7) |
| 679 | memcpy(brand, "Merced", 7); | 680 | memcpy(brand, "Merced", 7); |
| @@ -681,8 +682,7 @@ get_model_name(__u8 family, __u8 model) | |||
| 681 | case 0: memcpy(brand, "McKinley", 9); break; | 682 | case 0: memcpy(brand, "McKinley", 9); break; |
| 682 | case 1: memcpy(brand, "Madison", 8); break; | 683 | case 1: memcpy(brand, "Madison", 8); break; |
| 683 | case 2: memcpy(brand, "Madison up to 9M cache", 23); break; | 684 | case 2: memcpy(brand, "Madison up to 9M cache", 23); break; |
| 684 | } else | 685 | } |
| 685 | memcpy(brand, "Unknown", 8); | ||
| 686 | } | 686 | } |
| 687 | if (brandname[0] == '\0') | 687 | if (brandname[0] == '\0') |
| 688 | return strcpy(brandname, brand); | 688 | return strcpy(brandname, brand); |
