lkml.org 
[lkml]   [2007]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Don't fail ata device revalidation for bad _GTF methods
I can confirm that this patch solves the problem with s2ram on my laptop.

R

Matthew Garrett wrote:
> Experience suggests that the _GTF method may be bad. We currently fail
> device revalidation in that case, which seems excessive.
>
> Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
>
> ---
>
> diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
> index 08a52dd..545ea86 100644
> --- a/drivers/ata/libata-acpi.c
> +++ b/drivers/ata/libata-acpi.c
> @@ -312,7 +312,7 @@ EXPORT_SYMBOL_GPL(ata_acpi_stm);
> *
> * RETURNS:
> * Number of taskfiles on success, 0 if _GTF doesn't exist or doesn't
> - * contain valid data. -errno on other errors.
> + * contain valid data.
> */
> static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf,
> void **ptr_to_free)
> @@ -339,7 +339,6 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf,
> ata_dev_printk(dev, KERN_WARNING,
> "_GTF evaluation failed (AE 0x%x)\n",
> status);
> - rc = -EIO;
> }
> goto out_free;
> }
> @@ -359,7 +358,6 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf,
> ata_dev_printk(dev, KERN_WARNING,
> "_GTF unexpected object type 0x%x\n",
> out_obj->type);
> - rc = -EINVAL;
> goto out_free;
> }
>
> @@ -367,7 +365,6 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf,
> ata_dev_printk(dev, KERN_WARNING,
> "unexpected _GTF length (%d)\n",
> out_obj->buffer.length);
> - rc = -EINVAL;
> goto out_free;
> }
>
> @@ -511,10 +508,7 @@ static int ata_acpi_exec_tfs(struct ata_device *dev)
> int gtf_count, i, rc;
>
> /* get taskfiles */
> - rc = ata_dev_get_GTF(dev, &gtf, &ptr_to_free);
> - if (rc < 0)
> - return rc;
> - gtf_count = rc;
> + gtf_count = ata_dev_get_GTF(dev, &gtf, &ptr_to_free);
>
> /* execute them */
> for (i = 0, rc = 0; i < gtf_count; i++) {
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-11-09 13:33    [W:0.045 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site