From 78b9f6158d01bfd7e880a64f321f48c5b31a1989 Mon Sep 17 00:00:00 2001 From: Greg Dietsche Date: Thu, 16 Jun 2011 11:39:21 -0500 Subject: [PATCH] --- yaml --- r: 258422 b: refs/heads/master c: 47db477e46fa12eec40597b365ef1fad1cf17842 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_acpi.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0e7556e9b4d3..eb30ac9e0410 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4d8eaff78b1b0043e7674bead7018e4db8b03ba +refs/heads/master: 47db477e46fa12eec40597b365ef1fad1cf17842 diff --git a/trunk/drivers/ata/pata_acpi.c b/trunk/drivers/ata/pata_acpi.c index 91949d997555..54145edf50e8 100644 --- a/trunk/drivers/ata/pata_acpi.c +++ b/trunk/drivers/ata/pata_acpi.c @@ -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; @@ -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 = {