Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1172234c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus

parents 85255c0e b0cc58a2

include/sound/ak4113.h

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ struct ak4113 { 


int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,

		ak4113_write_t *write,

		const unsigned char pgm[AK4113_WRITABLE_REGS],

		const unsigned char *pgm,

		void *private_data, struct ak4113 **r_ak4113);

void snd_ak4113_reg_write(struct ak4113 *ak4113, unsigned char reg,

		unsigned char mask, unsigned char val);

sound/i2c/other/ak4113.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int snd_ak4113_dev_free(struct snd_device *device) 
}



int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,

		ak4113_write_t *write, const unsigned char pgm[5],

		ak4113_write_t *write, const unsigned char *pgm,

		void *private_data, struct ak4113 **r_ak4113)

{

	struct ak4113 *chip;

sound/pci/echoaudio/echoaudio.c

+2 −3
Original line number Diff line number Diff line
@@ -2184,10 +2184,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci, 
			goto ctl_error;

#endif



	if ((err = snd_card_register(card)) < 0) {

		snd_card_free(card);

	err = snd_card_register(card);

	if (err < 0)

		goto ctl_error;

	}

	snd_printk(KERN_INFO "Card registered: %s\n", card->longname);



	pci_set_drvdata(pci, chip);

sound/pci/mixart/mixart.c

+14 −10
Original line number Diff line number Diff line
@@ -1161,12 +1161,14 @@ static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private 
				unsigned long count, unsigned long pos)

{

	struct mixart_mgr *mgr = entry->private_data;

	unsigned long maxsize;



	count = count & ~3; /* make sure the read size is a multiple of 4 bytes */

	if(count <= 0)

	if (pos >= MIXART_BA0_SIZE)

		return 0;

	if(pos + count > MIXART_BA0_SIZE)

		count = (long)(MIXART_BA0_SIZE - pos);

	maxsize = MIXART_BA0_SIZE - pos;

	if (count > maxsize)

		count = maxsize;

	count = count & ~3; /* make sure the read size is a multiple of 4 bytes */

	if (copy_to_user_fromio(buf, MIXART_MEM(mgr, pos), count))

		return -EFAULT;

	return count;
@@ -1180,12 +1182,14 @@ static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_private 
				unsigned long count, unsigned long pos)

{

	struct mixart_mgr *mgr = entry->private_data;

	unsigned long maxsize;



	count = count & ~3; /* make sure the read size is a multiple of 4 bytes */

	if(count <= 0)

	if (pos > MIXART_BA1_SIZE)

		return 0;

	if(pos + count > MIXART_BA1_SIZE)

		count = (long)(MIXART_BA1_SIZE - pos);

	maxsize = MIXART_BA1_SIZE - pos;

	if (count > maxsize)

		count = maxsize;

	count = count & ~3; /* make sure the read size is a multiple of 4 bytes */

	if (copy_to_user_fromio(buf, MIXART_REG(mgr, pos), count))

		return -EFAULT;

	return count;