From b8981993c221c47fee643bcf6edcc8ab709d7254 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 25 Jun 2020 10:43:32 +0200 Subject: [PATCH] ANDROID: GKI: sound/usb/card.h: add Android ABI padding to struct snd_usb_endpoint There seems to be lots of people wanting to change this structure, and while it feels internal, due to some SoC patches, there's an ABI that needs to be preserved here over time. So add some padding to struct snd_usb_endpoint so that we can maintain this succesfully in the future. Of course, now that the padding is there, there never will be any need to change this structure again... Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I21cb3abbdca2961e33a94b2bc48b49f3fadbd206 --- sound/usb/card.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/usb/card.h b/sound/usb/card.h index ce4f213d5cf5..e3a59455f71c 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -2,6 +2,8 @@ #ifndef __USBAUDIO_CARD_H #define __USBAUDIO_CARD_H +#include + #define MAX_NR_RATES 1024 #define MAX_PACKS 6 /* per URB */ #define MAX_PACKS_HS (MAX_PACKS * 8) /* in high speed mode */ @@ -112,6 +114,11 @@ struct snd_usb_endpoint { spinlock_t lock; struct list_head list; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; struct media_ctl;