Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 115804
b: refs/heads/master
c: e06da9a
h: refs/heads/master
v: v3
  • Loading branch information
Will Newton authored and Greg Kroah-Hartman committed Oct 17, 2008
1 parent ce4091d commit da4060a
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 9d9d88c80e80397a71745ab80e69edd95e1f6b41
refs/heads/master: e06da9a828aa1ef52d1338b7a3d07291a04d581e
4 changes: 3 additions & 1 deletion trunk/drivers/usb/gadget/fsl_usb2_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2190,7 +2190,6 @@ static int __init struct_udc_setup(struct fsl_udc *udc,
udc->usb_state = USB_STATE_POWERED;
udc->ep0_dir = 0;
udc->remote_wakeup = 0; /* default to 0 on reset */
spin_lock_init(&udc->lock);

return 0;
}
Expand Down Expand Up @@ -2252,6 +2251,9 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
return -ENOMEM;
}

spin_lock_init(&udc_controller->lock);
udc_controller->stopped = 1;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
kfree(udc_controller);
Expand Down

0 comments on commit da4060a

Please sign in to comment.