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

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "Here are two bugfixes for I2C, fixing a memleak in the core and irq
  allocation for i801.

  Also three bugfixes for the at24 eeprom driver which Bartosz collected
  while taking over maintainership for this driver"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  eeprom: at24: check at24_read/write arguments
  eeprom: at24: fix reading from 24MAC402/24MAC602
  eeprom: at24: correctly set the size for at24mac402
  i2c: i2c-boardinfo: fix memory leaks on devinfo
  i2c: i801: Fix Failed to allocate irq -2147483648 error
parents 49a418d7 edef3098

drivers/i2c/busses/i2c-i801.c

+3 −0
Original line number Diff line number Diff line
@@ -1617,6 +1617,9 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	/* Default timeout in interrupt mode: 200 ms */

	priv->adapter.timeout = HZ / 5;



	if (dev->irq == IRQ_NOTCONNECTED)

		priv->features &= ~FEATURE_IRQ;



	if (priv->features & FEATURE_IRQ) {

		u16 pcictl, pcists;

drivers/i2c/i2c-boardinfo.c

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig 
					property_entries_dup(info->properties);

			if (IS_ERR(devinfo->board_info.properties)) {

				status = PTR_ERR(devinfo->board_info.properties);

				kfree(devinfo);

				break;

			}

		}
@@ -98,6 +99,7 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig 
					GFP_KERNEL);

			if (!devinfo->board_info.resources) {

				status = -ENOMEM;

				kfree(devinfo);

				break;

			}

		}

drivers/misc/eeprom/at24.c

+18 −1
Original line number Diff line number Diff line
@@ -425,7 +425,8 @@ static ssize_t at24_eeprom_read_mac(struct at24_data *at24, char *buf, 
	memset(msg, 0, sizeof(msg));

	msg[0].addr = client->addr;

	msg[0].buf = addrbuf;

	addrbuf[0] = 0x90 + offset;

	/* EUI-48 starts from 0x9a, EUI-64 from 0x98 */

	addrbuf[0] = 0xa0 - at24->chip.byte_len + offset;

	msg[0].len = 1;

	msg[1].addr = client->addr;

	msg[1].flags = I2C_M_RD;
@@ -568,6 +569,9 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count) 
	if (unlikely(!count))

		return count;



	if (off + count > at24->chip.byte_len)

		return -EINVAL;



	client = at24_translate_offset(at24, &off);



	ret = pm_runtime_get_sync(&client->dev);
@@ -613,6 +617,9 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) 
	if (unlikely(!count))

		return -EINVAL;



	if (off + count > at24->chip.byte_len)

		return -EINVAL;



	client = at24_translate_offset(at24, &off);



	ret = pm_runtime_get_sync(&client->dev);
@@ -730,6 +737,16 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) 
		dev_warn(&client->dev,

			"page_size looks suspicious (no power of 2)!\n");



	/*

	 * REVISIT: the size of the EUI-48 byte array is 6 in at24mac402, while

	 * the call to ilog2() in AT24_DEVICE_MAGIC() rounds it down to 4.

	 *

	 * Eventually we'll get rid of the magic values altoghether in favor of

	 * real structs, but for now just manually set the right size.

	 */

	if (chip.flags & AT24_FLAG_MAC && chip.byte_len == 4)

		chip.byte_len = 6;



	/* Use I2C operations unless we're stuck with SMBus extensions. */

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {

		if (chip.flags & AT24_FLAG_ADDR16)

CRA Git | Maintained and supported by SUSTech CRA and CCSE