From 24f82b90405e50876af87f63d393cfc12ffa3178 Mon Sep 17 00:00:00 2001 From: Luotao Fu Date: Fri, 19 Feb 2010 15:42:00 +0100 Subject: [PATCH] --- yaml --- r: 185423 b: refs/heads/master c: 8740cc7d0c532e098cc428251c08befd14f087d8 h: refs/heads/master i: 185421: dba87bb43fe87905d878d215031ef184d80377ee 185419: 8a61d099cfea4eee77710922ac440129f119ba55 185415: 5dcfdb835e11fe744493991f6cc866fe8a9e0422 185407: 463f9b27e40961124e1b563ffc0ec75a562f2a26 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-pnx4008.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ef99878f003e..2a47632a0593 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47cb17089c059d24e5da03f2b44ee3a089075b78 +refs/heads/master: 8740cc7d0c532e098cc428251c08befd14f087d8 diff --git a/trunk/drivers/usb/host/ohci-pnx4008.c b/trunk/drivers/usb/host/ohci-pnx4008.c index 2769326da42e..cd74bbdd007c 100644 --- a/trunk/drivers/usb/host/ohci-pnx4008.c +++ b/trunk/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 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) 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);