History

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

Pull i2c fixes from Wolfram Sang: "Three more driver bugfixes and an annotation fix for the core" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: robotfuzz-osif: fix control-request directions i2c: dev: Add __user annotation i2c: cp2615: check for allocation failure in cp2615_i2c_recv() i2c: i801: Ensure that SMBHSTSTS_INUSE_STS is cleared when leaving i801_access

Linus Torvalds committed 5 years ago

Commit 55fcd442 parents 7764c62 4ca070e4 files · +16 −7Browse files

Unified · Split

4 files
  1. drivers/i2c/busses/i2c-cp2615.c +10 −4
  2. drivers/i2c/busses/i2c-i801.c +3 −0
  3. drivers/i2c/busses/i2c-robotfuzz-osif.c +2 −2
  4. drivers/i2c/i2c-dev.c +1 −1
drivers/i2c/busses/i2c-cp2615.c+10−4
@@ -138,17 +138,23 @@ cp2615_i2c_send(struct usb_interface *usbif, struct cp2615_i2c_transfer *i2c_w) · 137 unmodified lines
138static int138static int
139cp2615_i2c_recv(struct usb_interface *usbif, unsigned char tag, void *buf)139cp2615_i2c_recv(struct usb_interface *usbif, unsigned char tag, void *buf)
140{140{
141 struct cp2615_iop_msg *msg = kzalloc(sizeof(*msg), GFP_KERNEL);
142 struct cp2615_i2c_transfer_result *i2c_r = (struct cp2615_i2c_transfer_result *)&msg->data;
143 struct usb_device *usbdev = interface_to_usbdev(usbif);141 struct usb_device *usbdev = interface_to_usbdev(usbif);
144 int res = usb_bulk_msg(usbdev, usb_rcvbulkpipe(usbdev, IOP_EP_IN),142 struct cp2615_iop_msg *msg;
145 msg, sizeof(struct cp2615_iop_msg), NULL, 0);143 struct cp2615_i2c_transfer_result *i2c_r;
144 int res;
145
146 msg = kzalloc(sizeof(*msg), GFP_KERNEL);
147 if (!msg)
148 return -ENOMEM;
146 149
150 res = usb_bulk_msg(usbdev, usb_rcvbulkpipe(usbdev, IOP_EP_IN), msg,
151 sizeof(struct cp2615_iop_msg), NULL, 0);
147 if (res < 0) {152 if (res < 0) {
148 kfree(msg);153 kfree(msg);
149 return res;154 return res;
150 }155 }
151 156
157 i2c_r = (struct cp2615_i2c_transfer_result *)&msg->data;
152 if (msg->msg != htons(iop_I2cTransferResult) || i2c_r->tag != tag) {158 if (msg->msg != htons(iop_I2cTransferResult) || i2c_r->tag != tag) {
153 kfree(msg);159 kfree(msg);
154 return -EIO;160 return -EIO;
drivers/i2c/busses/i2c-i801.c+3−0
@@ -978,6 +978,9 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, · 977 unmodified lines
978 }978 }
979 979
980out:980out:
981 /* Unlock the SMBus device for use by BIOS/ACPI */
982 outb_p(SMBHSTSTS_INUSE_STS, SMBHSTSTS(priv));
983
981 pm_runtime_mark_last_busy(&priv->pci_dev->dev);984 pm_runtime_mark_last_busy(&priv->pci_dev->dev);
982 pm_runtime_put_autosuspend(&priv->pci_dev->dev);985 pm_runtime_put_autosuspend(&priv->pci_dev->dev);
983 mutex_unlock(&priv->acpi_lock);986 mutex_unlock(&priv->acpi_lock);
drivers/i2c/busses/i2c-robotfuzz-osif.c+2−2
@@ -83,7 +83,7 @@ static int osif_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, · 82 unmodified lines
83 }83 }
84 }84 }
85 85
86 ret = osif_usb_read(adapter, OSIFI2C_STOP, 0, 0, NULL, 0);86 ret = osif_usb_write(adapter, OSIFI2C_STOP, 0, 0, NULL, 0);
87 if (ret) {87 if (ret) {
88 dev_err(&adapter->dev, "failure sending STOP\n");88 dev_err(&adapter->dev, "failure sending STOP\n");
89 return -EREMOTEIO;89 return -EREMOTEIO;
@@ -153,7 +153,7 @@ static int osif_probe(struct usb_interface *interface, · 63 unmodified lines
153 * Set bus frequency. The frequency is:153 * Set bus frequency. The frequency is:
154 * 120,000,000 / ( 16 + 2 * div * 4^prescale).154 * 120,000,000 / ( 16 + 2 * div * 4^prescale).
155 * Using dev = 52, prescale = 0 give 100KHz */155 * Using dev = 52, prescale = 0 give 100KHz */
156 ret = osif_usb_read(&priv->adapter, OSIFI2C_SET_BIT_RATE, 52, 0,156 ret = osif_usb_write(&priv->adapter, OSIFI2C_SET_BIT_RATE, 52, 0,
157 NULL, 0);157 NULL, 0);
158 if (ret) {158 if (ret) {
159 dev_err(&interface->dev, "failure sending bit rate");159 dev_err(&interface->dev, "failure sending bit rate");
drivers/i2c/i2c-dev.c+1−1
@@ -526,7 +526,7 @@ static long compat_i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned lo · 525 unmodified lines
526 return put_user(funcs, (compat_ulong_t __user *)arg);526 return put_user(funcs, (compat_ulong_t __user *)arg);
527 case I2C_RDWR: {527 case I2C_RDWR: {
528 struct i2c_rdwr_ioctl_data32 rdwr_arg;528 struct i2c_rdwr_ioctl_data32 rdwr_arg;
529 struct i2c_msg32 *p;529 struct i2c_msg32 __user *p;
530 struct i2c_msg *rdwr_pa;530 struct i2c_msg *rdwr_pa;
531 int i;531 int i;
532 532

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t