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

Commit 023ff3ee authored by Jean Delvare's avatar Jean Delvare Committed by Jaroslav Kysela
Browse files

[ALSA] sound: strlcpy is smart enough 



strlcpy already accounts for the trailing zero in its length
computation, so there is no need to substract one to the buffer size.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 523f1dce

sound/aoa/codecs/snd-aoa-codec-onyx.c

+2 −2
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ static int onyx_create(struct i2c_adapter *adapter, 
	onyx->i2c.driver = &onyx_driver;

	onyx->i2c.adapter = adapter;

	onyx->i2c.addr = addr & 0x7f;

	strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE-1);

	strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE);



	if (i2c_attach_client(&onyx->i2c)) {

		printk(KERN_ERR PFX "failed to attach to i2c\n");
@@ -1033,7 +1033,7 @@ static int onyx_create(struct i2c_adapter *adapter, 
		goto fail;

	}



	strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN-1);

	strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN);

	onyx->codec.owner = THIS_MODULE;

	onyx->codec.init = onyx_init_codec;

	onyx->codec.exit = onyx_exit_codec;

sound/aoa/codecs/snd-aoa-codec-tas.c

+2 −2
Original line number Diff line number Diff line
@@ -899,14 +899,14 @@ static int tas_create(struct i2c_adapter *adapter, 
	tas->i2c.addr = addr;

	/* seems that half is a saner default */

	tas->drc_range = TAS3004_DRC_MAX / 2;

	strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE-1);

	strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE);



	if (i2c_attach_client(&tas->i2c)) {

		printk(KERN_ERR PFX "failed to attach to i2c\n");

		goto fail;

	}



	strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN-1);

	strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN);

	tas->codec.owner = THIS_MODULE;

	tas->codec.init = tas_init_codec;

	tas->codec.exit = tas_exit_codec;