git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
drivers
/
staging
/
bcm
/
InterfaceInit.c
diff --git
a/drivers/staging/bcm/InterfaceInit.c
b/drivers/staging/bcm/InterfaceInit.c
index
824f9a4
..
e97ad99
100644
(file)
--- a/
drivers/staging/bcm/InterfaceInit.c
+++ b/
drivers/staging/bcm/InterfaceInit.c
@@
-277,7
+277,7
@@
usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
if(psAdapter->bDoSuspend)
{
#ifdef CONFIG_PM
-
udev->autosuspend_delay = 0
;
+
pm_runtime_set_autosuspend_delay(&udev->dev, 0)
;
intf->needs_remote_wakeup = 1;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
udev->autosuspend_disabled = 0;