diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-29 07:36:43 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-29 07:36:43 +0000 |
commit | e96d52d198511789d66d8fb7bd9a0f3c3c9c0107 (patch) | |
tree | a91c5c6dbd1ccf52974ba5063918e1c171ebeb1a /target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c | |
parent | 19be4923e0a2dfa6dd173288fc0ead976a0f2b38 (diff) | |
download | upstream-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.gz upstream-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.bz2 upstream-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.zip |
adm5120: merge 3.3 patches
SVN-Revision: 31511
Diffstat (limited to 'target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c')
-rw-r--r-- | target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c index 5aa90d670b..99ea9d530b 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c @@ -9,7 +9,7 @@ * (C) Copyright 2002 Hewlett-Packard Company * * Written by Christopher Hoover <ch@hpl.hp.com> - * Based on fragments of previous driver by Rusell King et al. + * Based on fragments of previous driver by Russell King et al. * * Modified for LH7A404 from ahcd-sa1111.c * by Durgesh Pattamatta <pattamattad@sharpsec.com> @@ -81,7 +81,7 @@ static int admhc_adm5120_probe(const struct hc_driver *driver, admhc_hcd_init(hcd_to_admhcd(hcd)); - retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); + retval = usb_add_hcd(hcd, irq, 0); if (retval) goto err_io; @@ -109,10 +109,7 @@ static void admhc_adm5120_remove(struct usb_hcd *hcd, usb_put_hcd(hcd); } -/*-------------------------------------------------------------------------*/ - -static int __devinit -admhc_adm5120_start(struct usb_hcd *hcd) +static int __devinit admhc_adm5120_start(struct usb_hcd *hcd) { struct admhcd *ahcd = hcd_to_admhcd(hcd); int ret; @@ -137,8 +134,6 @@ err: return ret; } -/*-------------------------------------------------------------------------*/ - static const struct hc_driver adm5120_hc_driver = { .description = hcd_name, .product_desc = "ADM5120 built-in USB 1.1 Host Controller", @@ -181,8 +176,6 @@ static const struct hc_driver adm5120_hc_driver = { .start_port_reset = admhc_start_port_reset, }; -/*-------------------------------------------------------------------------*/ - static int usb_hcd_adm5120_probe(struct platform_device *pdev) { int ret; |