mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
[IA64] Take defensive stance on ia64_pal_get_brand_info()
Stephane thought he saw a problem here (but was just confused by the return value from ia64_pal_get_brand_info()). But we should be more defensive here in case an prototype PAL for a future processor doesn't implement this PAL call. Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
parent
a460ef8d0a
commit
75f6a1de41
1 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue