Commit f2ba9392 authored Jul 18, 2008 by Jan Beulich Committed by H. Peter Anvin Jul 18, 2008

x86: check function status in EDD boot code



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>

parent ffaa152e

arch/x86/boot/edd.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -167,9 +167,8 @@ void query_edd(void)
		* Scan the BIOS-supported hard disks and query EDD
		* information...
		*/
		get_edd_info(devno, &ei);

		if (boot_params.eddbuf_entries < EDDMAXNR) {
		if (!get_edd_info(devno, &ei)
		&& boot_params.eddbuf_entries < EDDMAXNR) {
		memcpy(edp, &ei, sizeof ei);
		edp++;
		boot_params.eddbuf_entries++;