diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-12-12 20:56:36 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-12-12 20:56:36 +0100 |
| commit | 75f6a1de41f90543792403bf0ffb3ead59d0d8cc (patch) | |
| tree | 1e64c1195f04d84041dd3332e71ebfd83e5d2d95 /arch | |
| parent | [IA64] fix possible XPC deadlock when disconnecting (diff) | |
| download | linux-75f6a1de41f90543792403bf0ffb3ead59d0d8cc.tar.xz linux-75f6a1de41f90543792403bf0ffb3ead59d0d8cc.zip | |
[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>
Diffstat (limited to 'arch')
| -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) { 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); |