projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-for-linus-v3.12-rc3' of git://oss.sgi.com/xfs/xfs
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_ns87415.c
diff --git
a/drivers/ata/pata_ns87415.c
b/drivers/ata/pata_ns87415.c
index 6f6fa10605059baeb0aa5fee1b5bb4ae7991adb3..16dc3a63a23d5f763b28c92d7fcc9170d0e2320e 100644
(file)
--- a/
drivers/ata/pata_ns87415.c
+++ b/
drivers/ata/pata_ns87415.c
@@
-389,7
+389,7
@@
static const struct pci_device_id ns87415_pci_tbl[] = {
#ifdef CONFIG_PM
static int ns87415_reinit_one(struct pci_dev *pdev)
{
- struct ata_host *host =
dev_get_drvdata(&pdev->
dev);
+ struct ata_host *host =
pci_get_drvdata(p
dev);
int rc;
rc = ata_pci_device_do_resume(pdev);