diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-15 17:45:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-15 17:45:28 +0100 |
| commit | dfeae3379836fd0609488e73f4df260af4af2672 (patch) | |
| tree | 882ea698abf901ab0353a704a3ea44e7ab7320a1 /include | |
| parent | Merge tag 'drm-fixes-2019-02-15-1' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | mmc: meson-gx: fix interrupt name (diff) | |
| download | linux-dfeae3379836fd0609488e73f4df260af4af2672.tar.xz linux-dfeae3379836fd0609488e73f4df260af4af2672.zip | |
Merge tag 'mmc-v5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
"A couple of MMC fixes intended for v5.0-rc7.
MMC core:
- Fix deadlock bug for block I/O requests
MMC host:
- sunxi: Disable broken HS-DDR mode for H5 by default
- sunxi: Avoid unsupported speed modes declared via DT
- meson-gx: Restore interrupt name"
* tag 'mmc-v5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: meson-gx: fix interrupt name
mmc: block: handle complete_work on separate workqueue
mmc: sunxi: Filter out unsupported modes declared in the device tree
mmc: sunxi: Disable HS-DDR mode for H5 eMMC controller by default
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/card.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index de7377815b6b..8ef330027b13 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -308,6 +308,7 @@ struct mmc_card { unsigned int nr_parts; unsigned int bouncesz; /* Bounce buffer size */ + struct workqueue_struct *complete_wq; /* Private workqueue */ }; static inline bool mmc_large_sector(struct mmc_card *card) |