diff options
Diffstat (limited to 'drivers/usb/host/ehci-au1xxx.c')
| -rw-r--r-- | drivers/usb/host/ehci-au1xxx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c index da7532d38bf1..8b5f991e949c 100644 --- a/drivers/usb/host/ehci-au1xxx.c +++ b/drivers/usb/host/ehci-au1xxx.c | |||
| @@ -237,6 +237,7 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev) | |||
| 237 | if (usb_disabled()) | 237 | if (usb_disabled()) |
| 238 | return -ENODEV; | 238 | return -ENODEV; |
| 239 | 239 | ||
| 240 | /* FIXME we only want one one probe() not two */ | ||
| 240 | ret = usb_ehci_au1xxx_probe(&ehci_au1xxx_hc_driver, &hcd, pdev); | 241 | ret = usb_ehci_au1xxx_probe(&ehci_au1xxx_hc_driver, &hcd, pdev); |
| 241 | return ret; | 242 | return ret; |
| 242 | } | 243 | } |
| @@ -245,6 +246,7 @@ static int ehci_hcd_au1xxx_drv_remove(struct platform_device *pdev) | |||
| 245 | { | 246 | { |
| 246 | struct usb_hcd *hcd = platform_get_drvdata(pdev); | 247 | struct usb_hcd *hcd = platform_get_drvdata(pdev); |
| 247 | 248 | ||
| 249 | /* FIXME we only want one one remove() not two */ | ||
| 248 | usb_ehci_au1xxx_remove(hcd, pdev); | 250 | usb_ehci_au1xxx_remove(hcd, pdev); |
| 249 | return 0; | 251 | return 0; |
| 250 | } | 252 | } |
| @@ -265,7 +267,7 @@ static int ehci_hcd_au1xxx_drv_resume(struct device *dev) | |||
| 265 | return 0; | 267 | return 0; |
| 266 | } | 268 | } |
| 267 | */ | 269 | */ |
| 268 | MODULE_ALIAS("au1xxx-ehci"); | 270 | MODULE_ALIAS("platform:au1xxx-ehci"); |
| 269 | static struct platform_driver ehci_hcd_au1xxx_driver = { | 271 | static struct platform_driver ehci_hcd_au1xxx_driver = { |
| 270 | .probe = ehci_hcd_au1xxx_drv_probe, | 272 | .probe = ehci_hcd_au1xxx_drv_probe, |
| 271 | .remove = ehci_hcd_au1xxx_drv_remove, | 273 | .remove = ehci_hcd_au1xxx_drv_remove, |
| @@ -274,6 +276,5 @@ static struct platform_driver ehci_hcd_au1xxx_driver = { | |||
| 274 | /*.resume = ehci_hcd_au1xxx_drv_resume, */ | 276 | /*.resume = ehci_hcd_au1xxx_drv_resume, */ |
| 275 | .driver = { | 277 | .driver = { |
| 276 | .name = "au1xxx-ehci", | 278 | .name = "au1xxx-ehci", |
| 277 | .bus = &platform_bus_type | ||
| 278 | } | 279 | } |
| 279 | }; | 280 | }; |
