diff options
| author | <greg@echidna.(none)> | 2005-09-05 09:20:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:20:31 -0700 |
| commit | 4e0c64cfc1126a2946487d4771168458bb9ba9be (patch) | |
| tree | 1825887c36f029ca795561cc428fd6a2585cb5fa /drivers/scsi/sata_vsc.c | |
| parent | fae91e72b79ba9a21f0ce7551a1fd7e8984c85a6 (diff) | |
| parent | 67d2c36e901403bb97cb79ddb44d702c3284d0ba (diff) | |
Merge HEAD from gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git
Diffstat (limited to 'drivers/scsi/sata_vsc.c')
| -rw-r--r-- | drivers/scsi/sata_vsc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index 3985f344da4..cf94e0158a8 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c @@ -252,7 +252,7 @@ static struct ata_port_operations vsc_sata_ops = { .scr_write = vsc_sata_scr_write, .port_start = ata_port_start, .port_stop = ata_port_stop, - .host_stop = ata_host_stop, + .host_stop = ata_pci_host_stop, }; static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base) @@ -326,8 +326,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d probe_ent->dev = pci_dev_to_dev(pdev); INIT_LIST_HEAD(&probe_ent->node); - mmio_base = ioremap(pci_resource_start(pdev, 0), - pci_resource_len(pdev, 0)); + mmio_base = pci_iomap(pdev, 0, 0); if (mmio_base == NULL) { rc = -ENOMEM; goto err_out_free_ent; |