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
cad1b9da
Commit
cad1b9da
authored
Jul 17, 2007
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[netdrvr] eepro100, ne2k-pci: abort resume if pci_enable_device() fails
Signed-off-by:
Jeff Garzik
<
jeff@garzik.org
>
parent
f6c42865
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
drivers/net/eepro100.c
drivers/net/eepro100.c
+6
-1
drivers/net/ne2k-pci.c
drivers/net/ne2k-pci.c
+6
-1
No files found.
drivers/net/eepro100.c
View file @
cad1b9da
...
@@ -2292,10 +2292,15 @@ static int eepro100_resume(struct pci_dev *pdev)
...
@@ -2292,10 +2292,15 @@ static int eepro100_resume(struct pci_dev *pdev)
struct
net_device
*
dev
=
pci_get_drvdata
(
pdev
);
struct
net_device
*
dev
=
pci_get_drvdata
(
pdev
);
struct
speedo_private
*
sp
=
netdev_priv
(
dev
);
struct
speedo_private
*
sp
=
netdev_priv
(
dev
);
void
__iomem
*
ioaddr
=
sp
->
regs
;
void
__iomem
*
ioaddr
=
sp
->
regs
;
int
rc
;
pci_set_power_state
(
pdev
,
PCI_D0
);
pci_set_power_state
(
pdev
,
PCI_D0
);
pci_restore_state
(
pdev
);
pci_restore_state
(
pdev
);
pci_enable_device
(
pdev
);
rc
=
pci_enable_device
(
pdev
);
if
(
rc
)
return
rc
;
pci_set_master
(
pdev
);
pci_set_master
(
pdev
);
if
(
!
netif_running
(
dev
))
if
(
!
netif_running
(
dev
))
...
...
drivers/net/ne2k-pci.c
View file @
cad1b9da
...
@@ -669,10 +669,15 @@ static int ne2k_pci_suspend (struct pci_dev *pdev, pm_message_t state)
...
@@ -669,10 +669,15 @@ static int ne2k_pci_suspend (struct pci_dev *pdev, pm_message_t state)
static
int
ne2k_pci_resume
(
struct
pci_dev
*
pdev
)
static
int
ne2k_pci_resume
(
struct
pci_dev
*
pdev
)
{
{
struct
net_device
*
dev
=
pci_get_drvdata
(
pdev
);
struct
net_device
*
dev
=
pci_get_drvdata
(
pdev
);
int
rc
;
pci_set_power_state
(
pdev
,
0
);
pci_set_power_state
(
pdev
,
0
);
pci_restore_state
(
pdev
);
pci_restore_state
(
pdev
);
pci_enable_device
(
pdev
);
rc
=
pci_enable_device
(
pdev
);
if
(
rc
)
return
rc
;
NS8390_init
(
dev
,
1
);
NS8390_init
(
dev
,
1
);
netif_device_attach
(
dev
);
netif_device_attach
(
dev
);
...
...
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