1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index af456113c55d..a5c8d7e121d1 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_serverworks"
-#define DRV_VERSION "0.3.6"
+#define DRV_VERSION "0.3.7"
 
 #define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
 #define SVWKS_CSB6_REVISION     0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
@@ -128,7 +128,7 @@ static struct sv_cable_table cable_detect[] = {
         { PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_VENDOR_ID_DELL, dell_cable },
         { PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, PCI_VENDOR_ID_DELL, dell_cable },
         { PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_VENDOR_ID_SUN,  sun_cable },
-        { PCI_DEVICE_ID_SERVERWORKS_OSB4, PCI_ANY_ID, osb4_cable },
+        { PCI_DEVICE_ID_SERVERWORKS_OSB4IDE, PCI_ANY_ID, osb4_cable },
         { PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_ANY_ID, csb_cable },
         { PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, PCI_ANY_ID, csb_cable },
         { PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2, PCI_ANY_ID, csb_cable },
@@ -352,10 +352,12 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_handler    = ata_interrupt,
+        .irq_clear      = ata_bmdma_irq_clear,
+
         .port_start     = ata_port_start,
         .port_stop      = ata_port_stop,
         .host_stop      = ata_host_stop
@@ -385,10 +387,12 @@ static struct ata_port_operations serverworks_csb_port_ops = {
 
         .qc_prep        = ata_qc_prep,
         .qc_issue       = ata_qc_issue_prot,
-        .eng_timeout    = ata_eng_timeout,
+
         .data_xfer      = ata_pio_data_xfer,
 
         .irq_handler    = ata_interrupt,
+        .irq_clear      = ata_bmdma_irq_clear,
+
         .port_start     = ata_port_start,
         .port_stop      = ata_port_stop,
         .host_stop      = ata_host_stop