forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: GKI: restore a part of "struct mmc_host"

Browse source 
In commit 17a17bf506 ("mmc: core: Fix hanging on I/O during system
suspend for removable cards") that came in through an LTS update, the
struct mmc_host structure lost a field as it was no longer needed.

But, of course, the ABI check notices this, so put the field back, even
if it is no longer being used, as the ABI should be preserved here.
This allows the issue to still be resolved and everything remains
working properly.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4c6ab947a60d01779a26c7544334482748648c4c
This commit is contained in:
Greg Kroah-Hartman 2021-05-12 08:27:21 +02:00
commit a12132f848
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/mmc/host.h
View file

@ -286,6 +286,10 @@ struct mmc_host {
u32 ocr_avail_sdio; /* SDIO-specific OCR */
u32 ocr_avail_sd; /* SD-specific OCR */
u32 ocr_avail_mmc; /* MMC-specific OCR */
#ifdef CONFIG_PM_SLEEP
/* DO NOT USE, is not used, for abi preservation only */
struct notifier_block pm_notify;
#endif
struct wakeup_source *ws; /* Enable consume of uevents */
u32 max_current_330;
u32 max_current_300;