diff options
| author | Tong Zhang <ztong0001@gmail.com> | 2021-05-22 00:37:25 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-20 16:02:28 +0200 |
| commit | eeae4230dbf181f318a6604a74106765e0c66248 (patch) | |
| tree | a11ac6d9efdd04e3ba86ca1495e0aa882c3b4789 | |
| parent | 8898558843d3311c9225c1216bee8017e1215adb (diff) | |
| download | linux-stable-eeae4230dbf181f318a6604a74106765e0c66248.tar.gz linux-stable-eeae4230dbf181f318a6604a74106765e0c66248.tar.bz2 linux-stable-eeae4230dbf181f318a6604a74106765e0c66248.zip | |
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: 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>
| -rw-r--r-- | drivers/misc/cardreader/alcor_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cardreader/alcor_pci.c b/drivers/misc/cardreader/alcor_pci.c index 0a62307f7ffb..de6d44a158bb 100644 --- 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(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); |