From 0eb0ef1e88bebb5a23dfa6c1b0071917e5b34611 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sun, 1 Oct 2006 10:38:22 -0400 Subject: [PATCH] --- yaml --- r: 38472 b: refs/heads/master c: 15a7c3bbe344d75e4891c7d30595899c12ccfaa1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_artop.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8223a3524f84..18eb83997176 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e993835441734c184d70d3716eed78a08eeb71c2 +refs/heads/master: 15a7c3bbe344d75e4891c7d30595899c12ccfaa1 diff --git a/trunk/drivers/ata/pata_artop.c b/trunk/drivers/ata/pata_artop.c index 49565ef945f8..690828eb5226 100644 --- a/trunk/drivers/ata/pata_artop.c +++ b/trunk/drivers/ata/pata_artop.c @@ -426,7 +426,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &artop6260_ops, }; struct ata_port_info *port_info[2]; - struct ata_port_info *info; + struct ata_port_info *info = NULL; int ports = 2; if (!printed_version++) @@ -470,6 +470,9 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) pci_write_config_byte(pdev, 0x4a, (reg & ~0x01) | 0x80); } + + BUG_ON(info == NULL); + port_info[0] = port_info[1] = info; return ata_pci_init_one(pdev, port_info, ports); }