Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d1484f5 authored by Wei WANG's avatar Wei WANG Committed by Samuel Ortiz
Browse files

mfd: rtsx: Fix oops when rtsx_pci_sdmmc is not probed 



If rtsx_pci_sdmmc is not probed, function pointer pcr->slots[].card_event
will point to NULL, and thus rtsx_pci_card_detect will reference a NULL
pointer.
Check card_event pointer before referencing it can avoid kernel panic.

Signed-off-by: default avatarWei WANG <wei_wang@realsil.com.cn>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent ff0decd4

drivers/mfd/rtsx_pcr.c

+2 −2
Original line number Diff line number Diff line
@@ -786,10 +786,10 @@ static void rtsx_pci_card_detect(struct work_struct *work) 


	spin_unlock_irqrestore(&pcr->lock, flags);



	if (card_detect & SD_EXIST)

	if ((card_detect & SD_EXIST) && pcr->slots[RTSX_SD_CARD].card_event)

		pcr->slots[RTSX_SD_CARD].card_event(

				pcr->slots[RTSX_SD_CARD].p_dev);

	if (card_detect & MS_EXIST)

	if ((card_detect & MS_EXIST) && pcr->slots[RTSX_MS_CARD].card_event)

		pcr->slots[RTSX_MS_CARD].card_event(

				pcr->slots[RTSX_MS_CARD].p_dev);

}