summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:06:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:06:29 -0700
commit1c00650c233c404fadf9347329214d55283bd17a (patch)
tree9de7cda2fe2e54411cc24ff3befd758c9cb9cd74 /drivers/usb
parent26df0766a73a859bb93dc58e747c5028557a23fd (diff)
parent7f528135da9704d67db1f727162024b078e1cd8f (diff)
downloadop-kernel-dev-1c00650c233c404fadf9347329214d55283bd17a.zip
op-kernel-dev-1c00650c233c404fadf9347329214d55283bd17a.tar.gz
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: I2C bus multiplexer driver pca954x i2c: Multiplexed I2C bus core support i2c: Use a separate mutex for userspace client lists i2c: Make i2c_default_probe self-sufficient i2c: Drop dummy variable i2c: Move adapter locking helpers to i2c-core V4L/DVB: Use custom I2C probing function mechanism i2c: Add support for custom probe function i2c-dev: Use memdup_user i2c-dev: Remove unnecessary kmalloc casts
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-pnx4008.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index cd74bbd..653d6a6 100644
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -329,7 +329,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
memset(&i2c_info, 0, sizeof(struct i2c_board_info));
strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE);
isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,
- normal_i2c);
+ normal_i2c, NULL);
i2c_put_adapter(i2c_adap);
if (!isp1301_i2c_client) {
err("failed to connect I2C to ISP1301 USB Transceiver");
OpenPOWER on IntegriCloud