Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b06ab67b authored by Tong Zhang's avatar Tong Zhang Committed by Greg Kroah-Hartman
Browse files

misc: alcor_pci: fix inverted branch condition 



commit 281e468446994a7672733af2bf941f4110d4a895 upstream.

This patch fixes a trivial mistake that I made in the previous attempt
in fixing the null bridge issue. The branch condition is inverted and we
should call alcor_pci_find_cap_offset() only if bridge is not null.

Reported-by: default avatarColin Ian King <colin.king@canonical.com>
Fixes: 3ce3e45cc333 ("misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge")
Signed-off-by: default avatarTong Zhang <ztong0001@gmail.com>
Link: https://lore.kernel.org/r/20210522043725.602179-1-ztong0001@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f4088438

drivers/misc/cardreader/alcor_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void alcor_pci_init_check_aspm(struct alcor_pci_priv *priv) 
	 * priv->parent_pdev will be NULL. In this case we don't check its

	 * capability and disable ASPM completely.

	 */

	if (!priv->parent_pdev)

	if (priv->parent_pdev)

		priv->parent_cap_off = alcor_pci_find_cap_offset(priv,

							 priv->parent_pdev);