diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-02 09:40:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-02 09:40:09 -0700 |
| commit | 2270b890bc295c6de2f4e4e3a770025b76657699 (patch) | |
| tree | a295b405fee74d653f0972822ec306cbcdc1d648 /include | |
| parent | 09a6b0bc3be793ca8cba580b7992d73e9f68f15d (diff) | |
| parent | afd7f30886b0b445a4240a99020458a9772f2b89 (diff) | |
Merge tag 'mmc-v5.9-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
- Fix deadlock when removing MEMSTICK host
- Workaround broken CMDQ on Intel GLK based IRBIS models
* tag 'mmc-v5.9-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models
memstick: Skip allocating card when removing host
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/memstick.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/memstick.h b/include/linux/memstick.h index da4c65f9435f..ebf73d4ee969 100644 --- a/include/linux/memstick.h +++ b/include/linux/memstick.h @@ -281,6 +281,7 @@ struct memstick_host { struct memstick_dev *card; unsigned int retries; + bool removing; /* Notify the host that some requests are pending. */ void (*request)(struct memstick_host *host); |