Commit d18bbb7b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Sync with the pending 6.15 fixes.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 547c5775 62f134ab

include/sound/hdaudio.h

+2 −2
Original line number Diff line number Diff line
@@ -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

include/sound/pcm.h

+2 −0
Original line number Diff line number Diff line
@@ -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

sound/core/oss/pcm_oss.c

+1 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,7 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream) 
	runtime->oss.params = 0;

	runtime->oss.prepare = 1;

	runtime->oss.buffer_used = 0;

	if (runtime->dma_area)

		snd_pcm_format_set_silence(runtime->format, runtime->dma_area, bytes_to_samples(runtime, runtime->dma_bytes));

	snd_pcm_runtime_buffer_set_silence(runtime);



	runtime->oss.period_frames = snd_pcm_alsa_frames(substream, oss_period_size);

sound/core/pcm_native.c

+11 −0
Original line number Diff line number Diff line
@@ -723,6 +723,17 @@ static void snd_pcm_buffer_access_unlock(struct snd_pcm_runtime *runtime) 
	atomic_inc(&runtime->buffer_accessing);

}



/* fill the PCM buffer with the current silence format; called from pcm_oss.c */

void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime)

{

	snd_pcm_buffer_access_lock(runtime);

	if (runtime->dma_area)

		snd_pcm_format_set_silence(runtime->format, runtime->dma_area,

					   bytes_to_samples(runtime, runtime->dma_bytes));

	snd_pcm_buffer_access_unlock(runtime);

}

EXPORT_SYMBOL_GPL(snd_pcm_runtime_buffer_set_silence);



#if IS_ENABLED(CONFIG_SND_PCM_OSS)

#define is_oss_stream(substream)	((substream)->oss.oss)

#else

sound/core/seq_device.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ MODULE_LICENSE("GPL"); 
static int snd_seq_bus_match(struct device *dev, const struct device_driver *drv)

{

	struct snd_seq_device *sdev = to_seq_dev(dev);

	struct snd_seq_driver *sdrv = to_seq_drv(drv);

	const struct snd_seq_driver *sdrv = to_seq_drv(drv);



	return strcmp(sdrv->id, sdev->id) == 0 &&

		sdrv->argsize == sdev->argsize;