Merge branch 'fix/misc' into topic/misc (d2b88e4c) · Commits · 戴 / test

sound/atmel/abdac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -420,7 +420,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
		return PTR_ERR(pclk);
		}
		sample_clk = clk_get(&pdev->dev, "sample_clk");
		if (IS_ERR(pclk)) {
		if (IS_ERR(sample_clk)) {
		dev_dbg(&pdev->dev, "no sample clock\n");
		retval = PTR_ERR(pclk);
		goto out_put_pclk;

sound/core/pcm_lib.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,7 @@ static void xrun_log(struct snd_pcm_substream *substream,
		entry->jiffies = jiffies;
		entry->pos = pos;
		entry->period_size = runtime->period_size;
		entry->buffer_size = runtime->buffer_size;;
		entry->buffer_size = runtime->buffer_size;
		entry->old_hw_ptr = runtime->status->hw_ptr;
		entry->hw_ptr_base = runtime->hw_ptr_base;
		log->idx = (log->idx + 1) % XRUN_LOG_CNT;

sound/oss/dev_table.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ int sound_install_audiodrv(int vers, char name, struct audio_driver driver,
		if (sound_nblocks >= MAX_MEM_BLOCKS)
		sound_nblocks = MAX_MEM_BLOCKS - 1;

		op = (struct audio_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc(sizeof(struct audio_operations)));
		op = (struct audio_operations *) (sound_mem_blocks[sound_nblocks] = vzalloc(sizeof(struct audio_operations)));
		sound_nblocks++;
		if (sound_nblocks >= MAX_MEM_BLOCKS)
		sound_nblocks = MAX_MEM_BLOCKS - 1;
		@@ -81,7 +81,6 @@ int sound_install_audiodrv(int vers, char name, struct audio_driver driver,
		sound_unload_audiodev(num);
		return -(ENOMEM);
		}
		memset((char *) op, 0, sizeof(struct audio_operations));
		init_waitqueue_head(&op->in_sleeper);
		init_waitqueue_head(&op->out_sleeper);
		init_waitqueue_head(&op->poll_sleeper);
		@@ -128,7 +127,7 @@ int sound_install_mixer(int vers, char name, struct mixer_operations driver,
		/* FIXME: This leaks a mixer_operations struct every time its called
		until you unload sound! */

		op = (struct mixer_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc(sizeof(struct mixer_operations)));
		op = (struct mixer_operations *) (sound_mem_blocks[sound_nblocks] = vzalloc(sizeof(struct mixer_operations)));
		sound_nblocks++;
		if (sound_nblocks >= MAX_MEM_BLOCKS)
		sound_nblocks = MAX_MEM_BLOCKS - 1;
		@@ -137,7 +136,6 @@ int sound_install_mixer(int vers, char name, struct mixer_operations driver,
		printk(KERN_ERR "Sound: Can't allocate mixer driver for (%s)\n", name);
		return -ENOMEM;
		}
		memset((char *) op, 0, sizeof(struct mixer_operations));
		memcpy((char ) op, (char ) driver, driver_size);

		strlcpy(op->name, name, sizeof(op->name));

sound/oss/midibuf.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ int MIDIbuf_open(int dev, struct file *file)
		return err;

		parms[dev].prech_timeout = MAX_SCHEDULE_TIMEOUT;
		midi_in_buf[dev] = (struct midi_buf *) vmalloc(sizeof(struct midi_buf));
		midi_in_buf[dev] = vmalloc(sizeof(struct midi_buf));

		if (midi_in_buf[dev] == NULL)
		{
		@@ -188,7 +188,7 @@ int MIDIbuf_open(int dev, struct file *file)
		}
		midi_in_buf[dev]->len = midi_in_buf[dev]->head = midi_in_buf[dev]->tail = 0;

		midi_out_buf[dev] = (struct midi_buf *) vmalloc(sizeof(struct midi_buf));
		midi_out_buf[dev] = vmalloc(sizeof(struct midi_buf));

		if (midi_out_buf[dev] == NULL)
		{

sound/oss/pss.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -859,7 +859,7 @@ static int pss_coproc_ioctl(void dev_info, unsigned int cmd, void __user arg,
		return 0;

		case SNDCTL_COPR_LOAD:
		buf = (copr_buffer *) vmalloc(sizeof(copr_buffer));
		buf = vmalloc(sizeof(copr_buffer));
		if (buf == NULL)
		return -ENOSPC;
		if (copy_from_user(buf, arg, sizeof(copr_buffer))) {
		@@ -871,7 +871,7 @@ static int pss_coproc_ioctl(void dev_info, unsigned int cmd, void __user arg,
		return err;

		case SNDCTL_COPR_SENDMSG:
		mbuf = (copr_msg *)vmalloc(sizeof(copr_msg));
		mbuf = vmalloc(sizeof(copr_msg));
		if (mbuf == NULL)
		return -ENOSPC;
		if (copy_from_user(mbuf, arg, sizeof(copr_msg))) {
		@@ -895,7 +895,7 @@ static int pss_coproc_ioctl(void dev_info, unsigned int cmd, void __user arg,

		case SNDCTL_COPR_RCVMSG:
		err = 0;
		mbuf = (copr_msg *)vmalloc(sizeof(copr_msg));
		mbuf = vmalloc(sizeof(copr_msg));
		if (mbuf == NULL)
		return -ENOSPC;
		data = (unsigned short *)mbuf->data;

Admin message