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
nexedi
linux
Commits
ac27a097
Commit
ac27a097
authored
Mar 11, 2002
by
Arjan van de Ven
Committed by
Jeff Garzik
Mar 11, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move pci_enable_device and associated code above first PCI resource info access.
parent
165f042e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
12 deletions
+13
-12
drivers/net/eepro100.c
drivers/net/eepro100.c
+13
-12
No files found.
drivers/net/eepro100.c
View file @
ac27a097
...
...
@@ -570,6 +570,19 @@ static int __devinit eepro100_init_one (struct pci_dev *pdev,
if
(
speedo_debug
>
0
&&
did_version
++
==
0
)
printk
(
version
);
/* save power state before pci_enable_device overwrites it */
pm
=
pci_find_capability
(
pdev
,
PCI_CAP_ID_PM
);
if
(
pm
)
{
u16
pwr_command
;
pci_read_config_word
(
pdev
,
pm
+
PCI_PM_CTRL
,
&
pwr_command
);
acpi_idle_state
=
pwr_command
&
PCI_PM_CTRL_STATE_MASK
;
}
if
(
pci_enable_device
(
pdev
))
goto
err_out_free_mmio_region
;
pci_set_master
(
pdev
);
if
(
!
request_region
(
pci_resource_start
(
pdev
,
1
),
pci_resource_len
(
pdev
,
1
),
"eepro100"
))
{
printk
(
KERN_ERR
"eepro100: cannot reserve I/O ports
\n
"
);
...
...
@@ -600,18 +613,6 @@ static int __devinit eepro100_init_one (struct pci_dev *pdev,
pci_resource_start
(
pdev
,
0
),
irq
);
#endif
/* save power state b4 pci_enable_device overwrites it */
pm
=
pci_find_capability
(
pdev
,
PCI_CAP_ID_PM
);
if
(
pm
)
{
u16
pwr_command
;
pci_read_config_word
(
pdev
,
pm
+
PCI_PM_CTRL
,
&
pwr_command
);
acpi_idle_state
=
pwr_command
&
PCI_PM_CTRL_STATE_MASK
;
}
if
(
pci_enable_device
(
pdev
))
goto
err_out_free_mmio_region
;
pci_set_master
(
pdev
);
if
(
speedo_found1
(
pdev
,
ioaddr
,
cards_found
,
acpi_idle_state
)
==
0
)
cards_found
++
;
...
...
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