projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
ata
/
sata_nv.c
diff --git
a/drivers/ata/sata_nv.c
b/drivers/ata/sata_nv.c
index 85ee4993ca74c8fa90d8287fcc1010d246bd57cd..d74def823d3ed865be0841d771fb7141ac1c1a07 100644
(file)
--- a/
drivers/ata/sata_nv.c
+++ b/
drivers/ata/sata_nv.c
@@
-2435,7
+2435,7
@@
static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
#ifdef CONFIG_PM
static int nv_pci_device_resume(struct pci_dev *pdev)
{
- struct ata_host *host =
dev_get_drvdata(&pdev->
dev);
+ struct ata_host *host =
pci_get_drvdata(p
dev);
struct nv_host_priv *hpriv = host->private_data;
int rc;