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

Commit ad9ddd66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c-s3c2410: Fix build warning
  i2c-tiny-usb: Fix truncated adapter name
  i2c: Legacy i2c drivers shouldn't issue uevents
parents cdb7532f a1ba1583

drivers/i2c/busses/i2c-s3c2410.c

+2 −1
Original line number Diff line number Diff line
@@ -830,7 +830,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) 


	i2c->irq = res;

		

	dev_dbg(&pdev->dev, "irq resource %p (%ld)\n", res, res->start);

	dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res,

		(unsigned long)res->start);



	ret = i2c_add_adapter(&i2c->adap);

	if (ret < 0) {

drivers/i2c/busses/i2c-tiny-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int i2c_tiny_usb_probe(struct usb_interface *interface, 
	dev->adapter.class = I2C_CLASS_HWMON;

	dev->adapter.algo = &usb_algorithm;

	dev->adapter.algo_data = dev;

	snprintf(dev->adapter.name, I2C_NAME_SIZE,

	snprintf(dev->adapter.name, sizeof(dev->adapter.name),

		 "i2c-tiny-usb at bus %03d device %03d",

		 dev->usb_dev->bus->busnum, dev->usb_dev->devnum);

drivers/i2c/i2c-core.c

+3 −2
Original line number Diff line number Diff line
@@ -697,9 +697,10 @@ int i2c_attach_client(struct i2c_client *client) 
	if (client->driver)

		client->dev.driver = &client->driver->driver;



	if (client->driver && !is_newstyle_driver(client->driver))

	if (client->driver && !is_newstyle_driver(client->driver)) {

		client->dev.release = i2c_client_release;

	else

		client->dev.uevent_suppress = 1;

	} else

		client->dev.release = i2c_client_dev_release;



	snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),