Commit 3c387730 authored by Jiri Slaby's avatar Jiri Slaby Committed by Jeff Garzik

[libata] ata_piix: cleanup dmi strings checking

Commit
	ATA: piix, fix pointer deref on suspend
fixed a possible oops in an ugly manner. Use newly introduced dmi_match()
to make the code pretty again.
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Alexandru Romanescu <a_romanescu@yahoo.co.uk>
Cc: Tejun Heo <tj@kernel.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent d61c72e5
...@@ -1072,20 +1072,13 @@ static int piix_broken_suspend(void) ...@@ -1072,20 +1072,13 @@ static int piix_broken_suspend(void)
* matching is necessary because dmi_system_id.matches is * matching is necessary because dmi_system_id.matches is
* limited to four entries. * limited to four entries.
*/ */
if (dmi_get_system_info(DMI_SYS_VENDOR) && if (dmi_match(DMI_SYS_VENDOR, "TOSHIBA") &&
dmi_get_system_info(DMI_PRODUCT_NAME) && dmi_match(DMI_PRODUCT_NAME, "000000") &&
dmi_get_system_info(DMI_PRODUCT_VERSION) && dmi_match(DMI_PRODUCT_VERSION, "000000") &&
dmi_get_system_info(DMI_PRODUCT_SERIAL) && dmi_match(DMI_PRODUCT_SERIAL, "000000") &&
dmi_get_system_info(DMI_BOARD_VENDOR) && dmi_match(DMI_BOARD_VENDOR, "TOSHIBA") &&
dmi_get_system_info(DMI_BOARD_NAME) && dmi_match(DMI_BOARD_NAME, "Portable PC") &&
dmi_get_system_info(DMI_BOARD_VERSION) && dmi_match(DMI_BOARD_VERSION, "Version A0"))
!strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") &&
!strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") &&
!strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") &&
!strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") &&
!strcmp(dmi_get_system_info(DMI_BOARD_VENDOR), "TOSHIBA") &&
!strcmp(dmi_get_system_info(DMI_BOARD_NAME), "Portable PC") &&
!strcmp(dmi_get_system_info(DMI_BOARD_VERSION), "Version A0"))
return 1; return 1;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment