Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325818
b: refs/heads/master
c: b6dd245
h: refs/heads/master
v: v3
  • Loading branch information
Kuninori Morimoto authored and Greg Kroah-Hartman committed Aug 10, 2012
1 parent b4ef5bc commit 081bd83
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 86e4cb35f2260374df4139c2352afe7fe247cb60
refs/heads/master: b6dd245c4594482d46507a0bfd100439be367952
6 changes: 5 additions & 1 deletion trunk/drivers/usb/host/ohci-platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,14 @@ static int __devinit ohci_platform_probe(struct platform_device *dev)
{
struct usb_hcd *hcd;
struct resource *res_mem;
struct usb_ohci_pdata *pdata = dev->dev.platform_data;
int irq;
int err = -ENOMEM;

BUG_ON(!dev->dev.platform_data);
if (!pdata) {
WARN_ON(1);
return -ENODEV;
}

if (usb_disabled())
return -ENODEV;
Expand Down

0 comments on commit 081bd83

Please sign in to comment.