diff options
| author | Luotao Fu <l.fu@pengutronix.de> | 2010-02-19 15:42:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 09:06:29 -0700 |
| commit | 5eb790672b1970f8026cc65db354966d63a23e2f (patch) | |
| tree | 15ab5c1096f5d6a9d4d6204f0c92ccbf81d7820c /drivers/usb | |
| parent | 3c0611ea174f2dd680856120272f0c8babf1aa6b (diff) | |
| download | kernel-crypto-5eb790672b1970f8026cc65db354966d63a23e2f.tar.gz kernel-crypto-5eb790672b1970f8026cc65db354966d63a23e2f.tar.xz kernel-crypto-5eb790672b1970f8026cc65db354966d63a23e2f.zip | |
USB: fix I2C API usage in ohci-pnx4008.
commit 8740cc7d0c532e098cc428251c08befd14f087d8 upstream.
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>
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 2769326da42..cd74bbdd007 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) } i2c_adap = i2c_get_adapter(2); memset(&i2c_info, 0, sizeof(struct i2c_board_info)); - strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE); + strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE); isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info, normal_i2c); i2c_put_adapter(i2c_adap); @@ -411,7 +411,7 @@ out3: out2: clk_put(usb_clk); out1: - i2c_unregister_client(isp1301_i2c_client); + i2c_unregister_device(isp1301_i2c_client); isp1301_i2c_client = NULL; out_i2c_driver: i2c_del_driver(&isp1301_driver); @@ -430,7 +430,7 @@ static int usb_hcd_pnx4008_remove(struct platform_device *pdev) pnx4008_unset_usb_bits(); clk_disable(usb_clk); clk_put(usb_clk); - i2c_unregister_client(isp1301_i2c_client); + i2c_unregister_device(isp1301_i2c_client); isp1301_i2c_client = NULL; i2c_del_driver(&isp1301_driver); |