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

Commit 66c7acf6 authored by Jean Delvare's avatar Jean Delvare
Browse files

i2c: Use snprintf to set adapter names 



Use snprintf instead of sprintf to set adapter names, it's safer.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 1561bfe5

drivers/i2c/busses/i2c-ali1563.c

+2 −2
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ static int __devinit ali1563_probe(struct pci_dev * dev, 
	if ((error = ali1563_setup(dev)))

		goto exit;

	ali1563_adapter.dev.parent = &dev->dev;

	sprintf(ali1563_adapter.name,"SMBus ALi 1563 Adapter @ %04x",

		ali1563_smba);

	snprintf(ali1563_adapter.name, sizeof(ali1563_adapter.name),

		 "SMBus ALi 1563 Adapter @ %04x", ali1563_smba);

	if ((error = i2c_add_adapter(&ali1563_adapter)))

		goto exit_shutdown;

	return 0;

drivers/i2c/busses/i2c-amd756-s4882.c

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int __init amd756_s4882_init(void) 
	for (i = 1; i < 5; i++) {

		s4882_algo[i] = *(amd756_smbus.algo);

		s4882_adapter[i] = amd756_smbus;

		sprintf(s4882_adapter[i].name,

		snprintf(s4882_adapter[i].name, sizeof(s4882_adapter[i].name),

			 "SMBus 8111 adapter (CPU%d)", i-1);

		s4882_adapter[i].algo = s4882_algo+i;

		s4882_adapter[i].dev.parent = amd756_smbus.dev.parent;

drivers/i2c/busses/i2c-amd756.c

+3 −2
Original line number Diff line number Diff line
@@ -380,8 +380,9 @@ static int __devinit amd756_probe(struct pci_dev *pdev, 
	/* set up the sysfs linkage to our parent device */

	amd756_smbus.dev.parent = &pdev->dev;



	sprintf(amd756_smbus.name, "SMBus %s adapter at %04x",

		chipname[id->driver_data], amd756_ioport);

	snprintf(amd756_smbus.name, sizeof(amd756_smbus.name),

		 "SMBus %s adapter at %04x", chipname[id->driver_data],

		 amd756_ioport);



	error = i2c_add_adapter(&amd756_smbus);

	if (error) {

drivers/i2c/busses/i2c-at91.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev) 
		rc = -ENOMEM;

		goto fail2;

	}

	sprintf(adapter->name, "AT91");

	snprintf(adapter->name, sizeof(adapter->name), "AT91");

	adapter->algo = &at91_algorithm;

	adapter->class = I2C_CLASS_HWMON;

	adapter->dev.parent = &pdev->dev;

drivers/i2c/busses/i2c-sis5595.c

+2 −2
Original line number Diff line number Diff line
@@ -389,8 +389,8 @@ static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_ 
	/* set up the sysfs linkage to our parent device */

	sis5595_adapter.dev.parent = &dev->dev;



	sprintf(sis5595_adapter.name, "SMBus SIS5595 adapter at %04x",

		sis5595_base + SMB_INDEX);

	snprintf(sis5595_adapter.name, sizeof(sis5595_adapter.name),

		 "SMBus SIS5595 adapter at %04x", sis5595_base + SMB_INDEX);

	err = i2c_add_adapter(&sis5595_adapter);

	if (err) {

		release_region(sis5595_base + SMB_INDEX, 2);