Revert "char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol"

[ Upstream commit 31ecf177fd1234b9d428ba82145c5b988e9055d4 ]

This reverts commit cc13ee22cd297b0b7bbc81b250b1bd3e6c83d853.

The function monitor_card() is a timer handler that runs in an
atomic context, but it calls usleep_range() that can sleep.
As a result, the sleep-in-atomic-context bugs will happen.
The process is shown below:

    (atomic context)
monitor_card()
  set_protocol()
    usleep_range() //sleep

The origin commit 4e1f43d0aca0 ("[PATCH] New Omnikey Cardman
4000 driver") works fine.

Fixes: cc13ee22cd29 ("char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol")
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
Link: https://lore.kernel.org/r/20230118141000.5580-1-duoming@zju.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index adaec8fd4b16c5747f0ec6d60e645cc2a7d743cc..e656f42a28ac23b3ecb06394df09043fa62d12e4 100644 (file)
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -529,7 +529,8 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq)
                        DEBUGP(5, dev, "NumRecBytes is valid\n");
                        break;
                }
-               usleep_range(10000, 11000);
+               /* can not sleep as this is in atomic context */
+               mdelay(10);
        }
        if (i == 100) {
                DEBUGP(5, dev, "Timeout waiting for NumRecBytes getting "
@@ -549,7 +550,8 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq)
                        }
                        break;
                }
-               usleep_range(10000, 11000);
+               /* can not sleep as this is in atomic context */
+               mdelay(10);
        }
 
        /* check whether it is a short PTS reply? */