1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] MdeModulePkg/Sd: Fix type when adding model name string

Hao Wu posted 1 patch 5 years, 9 months ago
Failed in applying to current master (apply log)
MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c | 4 ++--
MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c     | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
[edk2] [PATCH] MdeModulePkg/Sd: Fix type when adding model name string
Posted by Hao Wu 5 years, 9 months ago 
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=952

Cc: Anbazhagan Baraneedharan <anbazhagan@hp.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c | 4 ++--
 MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
index 4ebced0b94..86f20bded2 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
+++ b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
@@ -4,7 +4,7 @@
   It produces BlockIo, BlockIo2 and StorageSecurity protocols to allow upper layer
   access the EMMC device.
 
-  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -627,7 +627,7 @@ DiscoverEmmcDevice (
       );
     AddUnicodeString2 (
       "en",
-      gEmmcDxeComponentName.SupportedLanguages,
+      gEmmcDxeComponentName2.SupportedLanguages,
       &Device->ControllerNameTable,
       Device->ModelName,
       FALSE
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
index fc060fdb34..b3b1af906c 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
+++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
@@ -4,7 +4,7 @@
   It produces BlockIo and BlockIo2 protocols to allow upper layer
   access the SD memory card device.
 
-  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -373,7 +373,7 @@ DiscoverSdDevice (
     );
   AddUnicodeString2 (
     "en",
-    gSdDxeComponentName.SupportedLanguages,
+    gSdDxeComponentName2.SupportedLanguages,
     &Device->ControllerNameTable,
     Device->ModelName,
     FALSE
-- 
2.12.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg/Sd: Fix type when adding model name string
Posted by Zeng, Star 5 years, 9 months ago 
Reviewed-by: Star Zeng <star.zeng@intel.com>

-----Original Message-----
From: Wu, Hao A 
Sent: Thursday, June 28, 2018 9:42 AM
To: edk2-devel@lists.01.org
Cc: Wu, Hao A <hao.a.wu@intel.com>; Anbazhagan Baraneedharan <anbazhagan@hp.com>; Zeng, Star <star.zeng@intel.com>; Dong, Eric <eric.dong@intel.com>
Subject: [PATCH] MdeModulePkg/Sd: Fix type when adding model name string

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=952

Cc: Anbazhagan Baraneedharan <anbazhagan@hp.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c | 4 ++--
 MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
index 4ebced0b94..86f20bded2 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
+++ b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
@@ -4,7 +4,7 @@
   It produces BlockIo, BlockIo2 and StorageSecurity protocols to allow upper layer
   access the EMMC device.
 
-  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights 
+ reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at @@ -627,7 +627,7 @@ DiscoverEmmcDevice (
       );
     AddUnicodeString2 (
       "en",
-      gEmmcDxeComponentName.SupportedLanguages,
+      gEmmcDxeComponentName2.SupportedLanguages,
       &Device->ControllerNameTable,
       Device->ModelName,
       FALSE
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
index fc060fdb34..b3b1af906c 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
+++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
@@ -4,7 +4,7 @@
   It produces BlockIo and BlockIo2 protocols to allow upper layer
   access the SD memory card device.
 
-  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights 
+ reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at @@ -373,7 +373,7 @@ DiscoverSdDevice (
     );
   AddUnicodeString2 (
     "en",
-    gSdDxeComponentName.SupportedLanguages,
+    gSdDxeComponentName2.SupportedLanguages,
     &Device->ControllerNameTable,
     Device->ModelName,
     FALSE
--
2.12.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.