diff options
| author | Ulf Hansson <ulfh@kernel.org> | 2026-09-29 15:32:30 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulfh@kernel.org> | 2026-09-29 15:32:30 +0200 |
| commit | c2063613bceaaffe864ff781082845d322ffb2e1 (patch) | |
| tree | a71aa8ffe21dc9a6bc9828e6da45efedeb5b4ea9 | |
| parent | 8761866e5aaed979e071353a921220f27275d689 (diff) | |
| parent | aa0a37b5024d921e96ac4f8f487c8bfbf1f1a582 (diff) | |
| download | linux-next-c2063613bceaaffe864ff781082845d322ffb2e1.tar.gz linux-next-c2063613bceaaffe864ff781082845d322ffb2e1.zip | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v7.3-rc[n] into the next branch, to allow them to
get tested together with the mmc changes that are targeted for the next
release.
Signed-off-by: Ulf Hansson <ulfh@kernel.org>
| -rw-r--r-- | drivers/memstick/core/memstick.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index e03989c4e99e..0d15f48ef51d 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c @@ -370,9 +370,7 @@ int memstick_set_rw_addr(struct memstick_dev *card) { card->next_request = h_memstick_set_rw_addr; memstick_new_req(card->host); - if (!wait_for_completion_timeout(&card->mrq_complete, - msecs_to_jiffies(500))) - card->current_mrq.error = -ETIMEDOUT; + wait_for_completion(&card->mrq_complete); return card->current_mrq.error; } @@ -405,9 +403,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host) card->next_request = h_memstick_read_dev_id; memstick_new_req(host); - if (!wait_for_completion_timeout(&card->mrq_complete, - msecs_to_jiffies(500))) - card->current_mrq.error = -ETIMEDOUT; + wait_for_completion(&card->mrq_complete); if (card->current_mrq.error) goto err_out; |