diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-01-21 15:50:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-01-21 15:50:36 +0100 |
| commit | c23f0550c05d40762b141808709667759291c938 (patch) | |
| tree | 24e8cfb58582b140c48e17eb49eaea8828d5708d /drivers/misc | |
| parent | ff112f1ecd10b72004eac05bae395e1c65f0c63c (diff) | |
| download | linux-next-c23f0550c05d40762b141808709667759291c938.tar.gz linux-next-c23f0550c05d40762b141808709667759291c938.zip | |
Revert "mmc: rtsx: reset power state on suspend"
This reverts commit eac85fbd0867c25ac517f58fae401d65c627edff.
This is not the correct change, so revert it for now.
Fixes: eac85fbd0867 ("mmc: rtsx: reset power state on suspend")
Cc: Matthew Schwartz <matthew.schwartz@linux.dev>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/cardreader/rtsx_pcr.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index f1f4d8ed544d..f9952d76d6ed 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -1654,7 +1654,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) struct pci_dev *pcidev = to_pci_dev(dev_d); struct pcr_handle *handle = pci_get_drvdata(pcidev); struct rtsx_pcr *pcr = handle->pcr; - struct rtsx_slot *slot = &pcr->slots[RTSX_SD_CARD]; dev_dbg(&(pcidev->dev), "--> %s\n", __func__); @@ -1662,9 +1661,6 @@ static int __maybe_unused rtsx_pci_suspend(struct device *dev_d) mutex_lock(&pcr->pcr_mutex); - if (slot->p_dev && slot->power_off) - slot->power_off(slot->p_dev); - rtsx_pci_power_off(pcr, HOST_ENTER_S3, false); mutex_unlock(&pcr->pcr_mutex); @@ -1776,17 +1772,12 @@ static int rtsx_pci_runtime_suspend(struct device *device) struct pci_dev *pcidev = to_pci_dev(device); struct pcr_handle *handle = pci_get_drvdata(pcidev); struct rtsx_pcr *pcr = handle->pcr; - struct rtsx_slot *slot = &pcr->slots[RTSX_SD_CARD]; dev_dbg(device, "--> %s\n", __func__); cancel_delayed_work_sync(&pcr->carddet_work); mutex_lock(&pcr->pcr_mutex); - - if (slot->p_dev && slot->power_off) - slot->power_off(slot->p_dev); - rtsx_pci_power_off(pcr, HOST_ENTER_S3, true); mutex_unlock(&pcr->pcr_mutex); |