diff options
author | Luotao Fu <l.fu@pengutronix.de> | 2010-02-19 09:42:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:55:15 -0500 |
commit | 8740cc7d0c532e098cc428251c08befd14f087d8 (patch) | |
tree | 00ac60b2811c9c320df606a424d29c4177ed797f /drivers/usb | |
parent | 47cb17089c059d24e5da03f2b44ee3a089075b78 (diff) |
USB: fix I2C API usage in ohci-pnx4008.
i2c_board_info doesn't contain a member called name. i2c_register_client
call does not exist.
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/ohci-pnx4008.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 2769326da42e..cd74bbdd007c 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
@@ -327,7 +327,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) | |||
327 | } | 327 | } |
328 | i2c_adap = i2c_get_adapter(2); | 328 | i2c_adap = i2c_get_adapter(2); |
329 | memset(&i2c_info, 0, sizeof(struct i2c_board_info)); | 329 | memset(&i2c_info, 0, sizeof(struct i2c_board_info)); |
330 | strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE); | 330 | strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE); |
331 | isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info, | 331 | isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info, |
332 | normal_i2c); | 332 | normal_i2c); |
333 | i2c_put_adapter(i2c_adap); | 333 | i2c_put_adapter(i2c_adap); |
@@ -411,7 +411,7 @@ out3: | |||
411 | out2: | 411 | out2: |
412 | clk_put(usb_clk); | 412 | clk_put(usb_clk); |
413 | out1: | 413 | out1: |
414 | i2c_unregister_client(isp1301_i2c_client); | 414 | i2c_unregister_device(isp1301_i2c_client); |
415 | isp1301_i2c_client = NULL; | 415 | isp1301_i2c_client = NULL; |
416 | out_i2c_driver: | 416 | out_i2c_driver: |
417 | i2c_del_driver(&isp1301_driver); | 417 | i2c_del_driver(&isp1301_driver); |
@@ -430,7 +430,7 @@ static int usb_hcd_pnx4008_remove(struct platform_device *pdev) | |||
430 | pnx4008_unset_usb_bits(); | 430 | pnx4008_unset_usb_bits(); |
431 | clk_disable(usb_clk); | 431 | clk_disable(usb_clk); |
432 | clk_put(usb_clk); | 432 | clk_put(usb_clk); |
433 | i2c_unregister_client(isp1301_i2c_client); | 433 | i2c_unregister_device(isp1301_i2c_client); |
434 | isp1301_i2c_client = NULL; | 434 | isp1301_i2c_client = NULL; |
435 | i2c_del_driver(&isp1301_driver); | 435 | i2c_del_driver(&isp1301_driver); |
436 | 436 | ||