projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
drivers
/
ata
/
pata_sis.c
diff --git
a/drivers/ata/pata_sis.c
b/drivers/ata/pata_sis.c
index
2d5ac13
..
1e83636
100644
(file)
--- a/
drivers/ata/pata_sis.c
+++ b/
drivers/ata/pata_sis.c
@@
-873,7
+873,7
@@
static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
#ifdef CONFIG_PM
static int sis_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);