lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: check function status in EDD boot code

Browse Source 
Without checking the return value of get_edd_info() and adding the
entry only in the success case, 6 devices show up under
/sys/firmware/edd/, no matter how many devices are actually present.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Jan Beulich
2008-07-18 13:35:37 +01:00
committed by H. Peter Anvin
parent ffaa152efd
commit f2ba93929f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/boot/edd.c
View File

@@ -167,9 +167,8 @@ void query_edd(void)
* Scan the BIOS-supported hard disks and query EDD * Scan the BIOS-supported hard disks and query EDD
* information... * information...
*/ */
get_edd_info(devno, &ei); if (!get_edd_info(devno, &ei)
&& boot_params.eddbuf_entries < EDDMAXNR) {
if (boot_params.eddbuf_entries < EDDMAXNR) {
memcpy(edp, &ei, sizeof ei); memcpy(edp, &ei, sizeof ei);
edp++; edp++;
boot_params.eddbuf_entries++; boot_params.eddbuf_entries++;