diff options
author | Tejun Heo <tj@kernel.org> | 2011-02-21 09:43:56 +0100 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-02-21 09:43:56 +0100 |
commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /drivers/usb/otg/nop-usb-xceiv.c | |
parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
download | op-kernel-dev-43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81.zip op-kernel-dev-43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81.tar.gz |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'drivers/usb/otg/nop-usb-xceiv.c')
-rw-r--r-- | drivers/usb/otg/nop-usb-xceiv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c index e70014a..8acf165 100644 --- a/drivers/usb/otg/nop-usb-xceiv.c +++ b/drivers/usb/otg/nop-usb-xceiv.c @@ -132,6 +132,8 @@ static int __devinit nop_usb_xceiv_probe(struct platform_device *pdev) platform_set_drvdata(pdev, nop); + BLOCKING_INIT_NOTIFIER_HEAD(&nop->otg.notifier); + return 0; exit: kfree(nop); |