summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-10-06 16:07:51 +0100
committerJeff Garzik <jgarzik@redhat.com>2009-10-16 06:22:40 -0400
commit6d4f950e9ea15816c6a4f266ce6b9e438346771e (patch)
tree86787a027e4c63f4bc40948cdcd47f0016afb907
parentf4b31db92d163df8a639f5a8c8633bdeb6e8432d (diff)
downloadop-kernel-dev-6d4f950e9ea15816c6a4f266ce6b9e438346771e.zip
op-kernel-dev-6d4f950e9ea15816c6a4f266ce6b9e438346771e.tar.gz
pata_sc1200: Fix crash on boot
The SC1200 needs a NULL terminator or it may cause a crash on boot. Bug #14227 Also correct a bogus comment as the driver had serializing added so can run dual port. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/ata/pata_sc1200.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index f49814d..3bbed83 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -235,8 +235,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
.udma_mask = ATA_UDMA2,
.port_ops = &sc1200_port_ops
};
- /* Can't enable port 2 yet, see top comments */
- const struct ata_port_info *ppi[] = { &info, };
+ const struct ata_port_info *ppi[] = { &info, NULL };
return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL);
}
OpenPOWER on IntegriCloud