Commit 70fae37a authored by Duoming Zhou's avatar Duoming Zhou Committed by Greg Kroah-Hartman

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

This reverts commit be826ada.

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 c1986ee9 ("[PATCH] New Omnikey Cardman
4000 driver") works fine.

Fixes: be826ada ("char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol")
Signed-off-by: default avatarDuoming Zhou <duoming@zju.edu.cn>
Link: https://lore.kernel.org/r/20230118141000.5580-1-duoming@zju.edu.cnSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af35dbad
......@@ -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? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment