aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai2021-08-05 08:21:48 +0200
committerTakashi Iwai2021-08-05 08:24:17 +0200
commitdf8bcf36be2755a39c2f1bcc1ea3c18329c29931 (patch)
tree476fbb0746ec2470c78f28fb97e88bb7280784ff /include
parentddddc0d4c76aabd15eddbd905d4bf009f2f30725 (diff)
ALSA: es1688: Avoid devres management for es1688 object creation
The recent refactoring of es1688 object creation with the use of devres caused a problem with the non-PnP probe of GUS driver, as it tries to probe multiple times with different parameters That is, this object needs the immediate resource release and the devres doesn't fit for it. This patch reverts partially the commit for restoring the classic resource management for es1688 object. Fixes: 1bb11c1c7f6e ("ALSA: es1688: Allocate resources with device-managed APIs") Reported-by: kernel test robot <oliver.sang@intel.com> Link: https://lore.kernel.org/r/20210805032513.GA30485@xsang-OptiPlex-9020 Link: https://lore.kernel.org/r/20210805062148.30951-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/sound/es1688.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/es1688.h b/include/sound/es1688.h
index da577bbf9cc7..099569c31fbb 100644
--- a/include/sound/es1688.h
+++ b/include/sound/es1688.h
@@ -18,6 +18,7 @@
struct snd_es1688 {
unsigned long port; /* port of ESS chip */
+ struct resource *res_port;
unsigned long mpu_port; /* MPU-401 port of ESS chip */
int irq; /* IRQ number of ESS chip */
int mpu_irq; /* MPU IRQ */