diff options
author | Alan Cox <alan@linux.intel.com> | 2009-10-06 16:07:51 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-09 16:22:52 -0800 |
commit | 1917888ae8076efca1ae51c7517806572ad8db02 (patch) | |
tree | 7eb29fe4a4602ee0054bd0f9e807afe059b82938 | |
parent | 01a6a52a3cadb6a6db03199f3ec7ccb023aac45f (diff) |
pata_sc1200: Fix crash on boot
commit 6d4f950e9ea15816c6a4f266ce6b9e438346771e upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/ata/pata_sc1200.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index f49814d6fd2e..3bbed8322ecf 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); } |