Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38472
b: refs/heads/master
c: 15a7c3b
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik committed Oct 1, 2006
1 parent bdb7f11 commit 0eb0ef1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e993835441734c184d70d3716eed78a08eeb71c2
refs/heads/master: 15a7c3bbe344d75e4891c7d30595899c12ccfaa1
5 changes: 4 additions & 1 deletion trunk/drivers/ata/pata_artop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 0eb0ef1

Please sign in to comment.