diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-05-22 21:34:24 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-05-22 21:34:24 +0300 |
| commit | d18bbb7b8a7b21238dd05f7ddb7d90e2a50171bf (patch) | |
| tree | 9d30b814fd7af00333f6249352fd0f450a040630 /include | |
| parent | 547c5775a742d9c83891b629b75d1d4c8e88d8c0 (diff) | |
| parent | 62f134ab190c5fd5c9f68fe638ad8e13bb8a4cb4 (diff) | |
| download | linux-d18bbb7b8a7b21238dd05f7ddb7d90e2a50171bf.tar.xz | |
Merge branch 'for-linus' into for-next
Sync with the pending 6.15 fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/hdaudio.h | 4 | ||||
| -rw-r--r-- | include/sound/pcm.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 6257152fa0ce..25668eee65cf 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -223,7 +223,7 @@ struct hdac_driver { struct device_driver driver; int type; const struct hda_device_id *id_table; - int (*match)(struct hdac_device *dev, struct hdac_driver *drv); + int (*match)(struct hdac_device *dev, const struct hdac_driver *drv); void (*unsol_event)(struct hdac_device *dev, unsigned int event); /* fields used by ext bus APIs */ @@ -235,7 +235,7 @@ struct hdac_driver { #define drv_to_hdac_driver(_drv) container_of(_drv, struct hdac_driver, driver) const struct hda_device_id * -hdac_get_device_id(struct hdac_device *hdev, struct hdac_driver *drv); +hdac_get_device_id(struct hdac_device *hdev, const struct hdac_driver *drv); /* * Bus verb operators diff --git a/include/sound/pcm.h b/include/sound/pcm.h index a268de860259..58fd6e84f961 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -1402,6 +1402,8 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_s #define snd_pcm_lib_mmap_iomem NULL #endif +void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime); + /** * snd_pcm_limit_isa_dma_size - Get the max size fitting with ISA DMA transfer * @dma: DMA number |