Commit 76c9e465 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:
 "One driver bugfix, a documentation bugfix, and an "uninitialized data"
  leak fix for the core"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  Documentation: i2c: add i2c-sysfs into index
  i2c: dev: zero out array used for i2c reads from userspace
  i2c: iproc: fix race between client unreg and tasklet
parents ba31f97d 3f12cc4b

Documentation/i2c/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Introduction 
   busses/index

   i2c-topology

   muxes/i2c-mux-gpio

   i2c-sysfs



Writing device drivers

======================

drivers/i2c/busses/i2c-bcm-iproc.c

+2 −2
Original line number Diff line number Diff line
@@ -1224,14 +1224,14 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave) 


	disable_irq(iproc_i2c->irq);



	tasklet_kill(&iproc_i2c->slave_rx_tasklet);



	/* disable all slave interrupts */

	tmp = iproc_i2c_rd_reg(iproc_i2c, IE_OFFSET);

	tmp &= ~(IE_S_ALL_INTERRUPT_MASK <<

			IE_S_ALL_INTERRUPT_SHIFT);

	iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, tmp);



	tasklet_kill(&iproc_i2c->slave_rx_tasklet);



	/* Erase the slave address programmed */

	tmp = iproc_i2c_rd_reg(iproc_i2c, S_CFG_SMBUS_ADDR_OFFSET);

	tmp &= ~BIT(S_CFG_EN_NIC_SMB_ADDR3_SHIFT);

drivers/i2c/i2c-dev.c

+3 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static ssize_t i2cdev_read(struct file *file, char __user *buf, size_t count, 
	if (count > 8192)

		count = 8192;



	tmp = kmalloc(count, GFP_KERNEL);

	tmp = kzalloc(count, GFP_KERNEL);

	if (tmp == NULL)

		return -ENOMEM;
@@ -150,7 +150,8 @@ static ssize_t i2cdev_read(struct file *file, char __user *buf, size_t count, 


	ret = i2c_master_recv(client, tmp, count);

	if (ret >= 0)

		ret = copy_to_user(buf, tmp, count) ? -EFAULT : ret;

		if (copy_to_user(buf, tmp, ret))

			ret = -EFAULT;

	kfree(tmp);

	return ret;

}