Skip to content

Commit 853736d

Browse files
christian-heuselgregkh
authored andcommitted
Revert "drivers/card_reader/rtsx_usb: Restore interrupt based detection"
commit 2397d61 upstream. This reverts commit 235b630. This commit was found responsible for issues with SD card recognition, as users had to re-insert their cards in the readers and wait for a while. As for some people the SD card was involved in the boot process it also caused boot failures. Cc: [email protected] Link: https://bbs.archlinux.org/viewtopic.php?id=303321 Fixes: 235b630 ("drivers/card_reader/rtsx_usb: Restore interrupt based detection") Reported-by: qf <[email protected]> Closes: https://lore.kernel.org/all/[email protected] Signed-off-by: Christian Heusel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5897eaa commit 853736d

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

drivers/misc/cardreader/rtsx_usb.c

-15
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ static int rtsx_usb_get_status_with_bulk(struct rtsx_ucr *ucr, u16 *status)
286286
int rtsx_usb_get_card_status(struct rtsx_ucr *ucr, u16 *status)
287287
{
288288
int ret;
289-
u8 interrupt_val = 0;
290289
u16 *buf;
291290

292291
if (!status)
@@ -309,20 +308,6 @@ int rtsx_usb_get_card_status(struct rtsx_ucr *ucr, u16 *status)
309308
ret = rtsx_usb_get_status_with_bulk(ucr, status);
310309
}
311310

312-
rtsx_usb_read_register(ucr, CARD_INT_PEND, &interrupt_val);
313-
/* Cross check presence with interrupts */
314-
if (*status & XD_CD)
315-
if (!(interrupt_val & XD_INT))
316-
*status &= ~XD_CD;
317-
318-
if (*status & SD_CD)
319-
if (!(interrupt_val & SD_INT))
320-
*status &= ~SD_CD;
321-
322-
if (*status & MS_CD)
323-
if (!(interrupt_val & MS_INT))
324-
*status &= ~MS_CD;
325-
326311
/* usb_control_msg may return positive when success */
327312
if (ret < 0)
328313
return ret;

0 commit comments

Comments
 (0)