Commit 31b08106 authored by Ricky Wu's avatar Ricky Wu Committed by Greg Kroah-Hartman
Browse files

misc: rtsx: init value of aspm_enabled 



make sure ASPM state sync with pcr->aspm_enabled
init value pcr->aspm_enabled

Cc: stable@vger.kernel.org
Signed-off-by: default avatarRicky Wu <ricky_wu@realtek.com>
Link: https://lore.kernel.org/r/20210122081906.19100-1-ricky_wu@realtek.com


Fixes: d928061c ("misc: rtsx: modify en/disable aspm function")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b11f623c

drivers/misc/cardreader/rtsx_pcr.c

+6 −1
Original line number Diff line number Diff line
@@ -1512,6 +1512,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, 
	struct pcr_handle *handle;

	u32 base, len;

	int ret, i, bar = 0;

	u8 val;



	dev_dbg(&(pcidev->dev),

		": Realtek PCI-E Card Reader found at %s [%04x:%04x] (rev %x)\n",
@@ -1577,7 +1578,11 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, 
	pcr->host_cmds_addr = pcr->rtsx_resv_buf_addr;

	pcr->host_sg_tbl_ptr = pcr->rtsx_resv_buf + HOST_CMDS_BUF_LEN;

	pcr->host_sg_tbl_addr = pcr->rtsx_resv_buf_addr + HOST_CMDS_BUF_LEN;



	rtsx_pci_read_register(pcr, ASPM_FORCE_CTL, &val);

	if (val & FORCE_ASPM_CTL0 && val & FORCE_ASPM_CTL1)

		pcr->aspm_enabled = false;

	else

		pcr->aspm_enabled = true;

	pcr->card_inserted = 0;

	pcr->card_removed = 0;

	INIT_DELAYED_WORK(&pcr->carddet_work, rtsx_pci_card_detect);