Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
6a3cd6f1
Commit
6a3cd6f1
authored
May 07, 2002
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
USB ohci driver update
add PMAC changes found in -dj tree
parent
a616c214
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
drivers/usb/host/usb-ohci.c
drivers/usb/host/usb-ohci.c
+12
-11
No files found.
drivers/usb/host/usb-ohci.c
View file @
6a3cd6f1
...
...
@@ -83,7 +83,8 @@
#ifdef CONFIG_PMAC_PBOOK
#include <asm/feature.h>
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
#include <asm/pci-bridge.h>
#ifndef CONFIG_PM
#define CONFIG_PM
...
...
@@ -2731,8 +2732,8 @@ ohci_pci_suspend (struct pci_dev *dev, u32 state)
/* Disable USB PAD & cell clock */
of_node
=
pci_device_to_OF_node
(
ohci
->
ohci_dev
);
if
(
of_node
&&
_machine
==
_MACH_Pmac
)
feature_set_usb_power
(
of_node
,
0
);
if
(
of_node
)
pmac_call_feature
(
PMAC_FTR_USB_ENABLE
,
of_node
,
0
,
0
);
}
#endif
return
0
;
...
...
@@ -2761,8 +2762,8 @@ ohci_pci_resume (struct pci_dev *dev)
/* Re-enable USB PAD & cell clock */
of_node
=
pci_device_to_OF_node
(
ohci
->
ohci_dev
);
if
(
of_node
&&
_machine
==
_MACH_Pmac
)
feature_set_usb_power
(
of_node
,
1
);
if
(
of_node
)
pmac_call_feature
(
PMAC_FTR_USB_ENABLE
,
of_node
,
0
,
1
);
}
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment