Commit 945be38c authored by Adrian Hunter's avatar Adrian Hunter Committed by Chris Ball

mmc: sdhci-pci: Fix possibility of chip->fixes being null

It is possible for chip->fixes to be null.  Check before dereferencing it.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable <stable@vger.kernel.org> # 3.11+
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 77a0122e
...@@ -1378,7 +1378,8 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( ...@@ -1378,7 +1378,8 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
* from runtime suspend. If it is not there, don't allow runtime PM. * from runtime suspend. If it is not there, don't allow runtime PM.
* Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure. * Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure.
*/ */
if (chip->fixes->own_cd_for_runtime_pm && !gpio_is_valid(slot->cd_gpio)) if (chip->fixes && chip->fixes->own_cd_for_runtime_pm &&
!gpio_is_valid(slot->cd_gpio))
chip->allow_runtime_pm = false; chip->allow_runtime_pm = false;
return slot; return slot;
......
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