diff options
| author | Tobias Powalowski <tobias@T-POWA-LX.(none)> | 2008-09-09 11:40:26 +0200 |
|---|---|---|
| committer | Tobias Powalowski <tobias@T-POWA-LX.(none)> | 2008-09-09 11:40:26 +0200 |
| commit | 1522f41c3673aa7faae066aa1c32f84e21ba34c2 (patch) | |
| tree | 12ff1c35ea79ea3a10d47fe0c7d7d23a914ee6aa /patches | |
| parent | acd92c2527117b0d0d201c2a7420f3f86a809f88 (diff) | |
' fixed http://bugs.archlinux.org/task/11388
bumped to new upstream 2.6.26.5 patch'
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/sata_nv.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/patches/sata_nv.patch b/patches/sata_nv.patch new file mode 100644 index 0000000..3704029 --- /dev/null +++ b/patches/sata_nv.patch @@ -0,0 +1,44 @@ +diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c +index 858f706..1e1f3f3 100644 +--- a/drivers/ata/sata_nv.c ++++ b/drivers/ata/sata_nv.c +@@ -309,8 +309,6 @@ static void nv_nf2_freeze(struct ata_port *ap); + static void nv_nf2_thaw(struct ata_port *ap); + static void nv_ck804_freeze(struct ata_port *ap); + static void nv_ck804_thaw(struct ata_port *ap); +-static int nv_hardreset(struct ata_link *link, unsigned int *class, +- unsigned long deadline); + static int nv_adma_slave_config(struct scsi_device *sdev); + static int nv_adma_check_atapi_dma(struct ata_queued_cmd *qc); + static void nv_adma_qc_prep(struct ata_queued_cmd *qc); +@@ -407,7 +405,7 @@ static struct scsi_host_template nv_swncq_sht = { + + static struct ata_port_operations nv_generic_ops = { + .inherits = &ata_bmdma_port_ops, +- .hardreset = nv_hardreset, ++ .hardreset = ATA_OP_NULL, + .scr_read = nv_scr_read, + .scr_write = nv_scr_write, + }; +@@ -1588,21 +1586,6 @@ static void nv_mcp55_thaw(struct ata_port *ap) + ata_sff_thaw(ap); + } + +-static int nv_hardreset(struct ata_link *link, unsigned int *class, +- unsigned long deadline) +-{ +- int rc; +- +- /* SATA hardreset fails to retrieve proper device signature on +- * some controllers. Request follow up SRST. For more info, +- * see http://bugzilla.kernel.org/show_bug.cgi?id=3352 +- */ +- rc = sata_sff_hardreset(link, class, deadline); +- if (rc) +- return rc; +- return -EAGAIN; +-} +- + static void nv_adma_error_handler(struct ata_port *ap) + { + struct nv_adma_port_priv *pp = ap->private_data; |