The sata_sis driver supports SATA and PATA ports. The broken support
of both types in one controller is fixed.
the pata133 sis controllers does not support a drive present status
in the pci configspace like the older sis controllers, check removed.
Signed-off-by: Uwe Koziolek <uwe.koziolek@xxxxxxx>
--- a/drivers/ata/sata_sis.c 2007-05-22 11:05:38.000000000 +0200
+++ b/drivers/ata/sata_sis.c 2007-05-23 00:24:28.000000000 +0200
@@ -255,7 +255,7 @@
{
static int printed_version;
struct ata_port_info pi = sis_port_info;
- const struct ata_port_info *ppi[] = { &pi, NULL };
+ const struct ata_port_info *ppi[] = { &pi, &pi };
struct ata_host *host;
u32 genctl, val;
u8 pmr;
--- a/drivers/ata/pata_sis.c 2007-05-22 11:05:38.000000000 +0200
+++ b/drivers/ata/pata_sis.c 2007-05-23 23:10:33.000000000 +0200
@@ -154,6 +154,19 @@
/**
+ * sis_133_error_handler - Probe specified port on PATA host controller
+ * @ap: Port to probe
+ *
+ * LOCKING:
+ * None (inherited from caller).
+ */
+
+static void sis_133_error_handler(struct ata_port *ap)
+{
+ ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL, ata_std_postreset);
+}
+
+/**
* sis_error_handler - Probe specified port on PATA host controller
* @ap: Port to probe
*
@@ -540,7 +553,7 @@
.freeze = ata_bmdma_freeze,
.thaw = ata_bmdma_thaw,
- .error_handler = sis_error_handler,
+ .error_handler = sis_133_error_handler,
.post_internal_cmd = ata_bmdma_post_internal_cmd,
.cable_detect = sis_133_cable_detect,
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
