Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258422
b: refs/heads/master
c: 47db477
h: refs/heads/master
v: v3
  • Loading branch information
Greg Dietsche authored and Jeff Garzik committed Jul 23, 2011
1 parent 4910e77 commit 78b9f61
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 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: d4d8eaff78b1b0043e7674bead7018e4db8b03ba
refs/heads/master: 47db477e46fa12eec40597b365ef1fad1cf17842
8 changes: 1 addition & 7 deletions trunk/drivers/ata/pata_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,6 @@ static int pacpi_port_start(struct ata_port *ap)
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
struct pata_acpi *acpi;

int ret;

if (ap->acpi_handle == NULL)
return -ENODEV;

Expand All @@ -205,11 +203,7 @@ static int pacpi_port_start(struct ata_port *ap)
return -ENOMEM;
acpi->mask[0] = pacpi_discover_modes(ap, &ap->link.device[0]);
acpi->mask[1] = pacpi_discover_modes(ap, &ap->link.device[1]);
ret = ata_bmdma_port_start(ap);
if (ret < 0)
return ret;

return ret;
return ata_bmdma_port_start(ap);
}

static struct scsi_host_template pacpi_sht = {
Expand Down

0 comments on commit 78b9f61

Please sign in to comment.