| From 281e468446994a7672733af2bf941f4110d4a895 Mon Sep 17 00:00:00 2001 |
| From: Tong Zhang <ztong0001@gmail.com> |
| Date: Sat, 22 May 2021 00:37:25 -0400 |
| Subject: misc: alcor_pci: fix inverted branch condition |
| |
| From: Tong Zhang <ztong0001@gmail.com> |
| |
| 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: Colin Ian King <colin.king@canonical.com> |
| Fixes: 3ce3e45cc333 ("misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge") |
| Signed-off-by: Tong Zhang <ztong0001@gmail.com> |
| Link: https://lore.kernel.org/r/20210522043725.602179-1-ztong0001@gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/misc/cardreader/alcor_pci.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/misc/cardreader/alcor_pci.c |
| +++ b/drivers/misc/cardreader/alcor_pci.c |
| @@ -144,7 +144,7 @@ static void alcor_pci_init_check_aspm(st |
| * 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); |
| |
