KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB driver fixes * fix compiler warning in adm5120-hcd.c * allocate mem_resource with the correct size * fix driver name in the platform device structure

Browse source 
SVN-Revision: 8331
This commit is contained in:
Gabor Juhos 2007-08-03 15:59:23 +00:00
parent c592d03090
commit ce520f5424
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/adm5120-2.6/files/arch/mips/adm5120/platform.c
View file

@ -97,7 +97,7 @@ struct resource adm5120_usbc_resources[] = {
}; };
struct platform_device adm5120_usbc_device = { struct platform_device adm5120_usbc_device = {
.name = "adm5120-usbc", .name = "adm5120-hcd",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(adm5120_usbc_resources), .num_resources = ARRAY_SIZE(adm5120_usbc_resources),
.resource = adm5120_usbc_resources, .resource = adm5120_usbc_resources,

10
target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
View file

@ -766,7 +766,7 @@ static int admhcd_sw_reset(struct admhcd *ahcd)
break; break;
} }
if (!retries) { if (!retries) {
printk(KERN_WARNING "%s Software reset timeout\n", hcd_name); printk(KERN_WARNING "%s: software reset timeout\n", hcd_name);
ret = -ETIME; ret = -ETIME;
} }
spin_unlock_irqrestore(&ahcd->lock, flags); spin_unlock_irqrestore(&ahcd->lock, flags);
@ -794,7 +794,8 @@ static int admhcd_reset(struct usb_hcd *hcd)
break; break;
} }
if (!val) { if (!val) {
printk(KERN_WARNING "Device not ready after %dms\n", timeout); printk(KERN_WARNING "%s: device not ready after %dms\n",
hcd_name, timeout);
ret = -ENODEV; ret = -ENODEV;
} }
return ret; return ret;
@ -869,14 +870,13 @@ static int __init adm5120hcd_probe(struct platform_device *pdev)
goto out; goto out;
} }
if (!request_mem_region(data->start, 2, hcd_name)) { if (!request_mem_region(data->start, resource_len(data), hcd_name)) {
printk(KERN_DEBUG PFX "cannot request memory regions for the data resource\n"); printk(KERN_DEBUG PFX "cannot request memory regions for the data resource\n");
err = -EBUSY; err = -EBUSY;
goto out; goto out;
} }
data_reg = ioremap(data->start, resource_len(data)); data_reg = ioremap(data->start, resource_len(data));
if (data_reg == NULL) { if (data_reg == NULL) {
printk(KERN_DEBUG PFX "unable to ioremap\n"); printk(KERN_DEBUG PFX "unable to ioremap\n");
err = -ENOMEM; err = -ENOMEM;
@ -887,7 +887,7 @@ static int __init adm5120hcd_probe(struct platform_device *pdev)
if (!hcd) { if (!hcd) {
printk(KERN_DEBUG PFX "unable to create the hcd\n"); printk(KERN_DEBUG PFX "unable to create the hcd\n");
err = -ENOMEM; err = -ENOMEM;
goto out_mem; goto out_unmap;
} }
hcd->rsrc_start = data->start; hcd->rsrc_start = data->start;