Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0f069788c32ea7af108c6032dfb0594cc718bde8
Commit:     0f069788c32ea7af108c6032dfb0594cc718bde8
Parent:     0eaea364edec4132fe42ef33fe87edb15f00507b
Author:     Alan Cox <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 19 15:52:56 2008 +0000
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Wed Jan 23 05:24:17 2008 -0500

    pata_serverworks: Fix cable types and cosmetics
    
    Minor tidying up. Only real change is to return UNK not 80 wire when we
    don't know the cable type. This didn't use to matter but with Tejun's
    reworking of cable detection it may.
    
    Signed-off-by: Alan Cox <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/ata/pata_serverworks.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 8bed888..9c523fb 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.4.2"
+#define DRV_VERSION "0.4.3"
 
 #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) */
@@ -102,7 +102,7 @@ static int osb4_cable(struct ata_port *ap) {
 }
 
 /**
- *     csb4_cable      -       CSB5/6 cable detect
+ *     csb_cable       -       CSB5/6 cable detect
  *     @ap: ATA port to check
  *
  *     Serverworks default arrangement is to use the drive side detection
@@ -110,7 +110,7 @@ static int osb4_cable(struct ata_port *ap) {
  */
 
 static int csb_cable(struct ata_port *ap) {
-       return ATA_CBL_PATA80;
+       return ATA_CBL_PATA_UNK;
 }
 
 struct sv_cable_table {
@@ -231,7 +231,6 @@ static unsigned long serverworks_csb_filter(struct 
ata_device *adev, unsigned lo
        return ata_pci_default_filter(adev, mask);
 }
 
-
 /**
  *     serverworks_set_piomode -       set initial PIO mode data
  *     @ap: ATA interface
@@ -243,7 +242,7 @@ static unsigned long serverworks_csb_filter(struct 
ata_device *adev, unsigned lo
 static void serverworks_set_piomode(struct ata_port *ap, struct ata_device 
*adev)
 {
        static const u8 pio_mode[] = { 0x5d, 0x47, 0x34, 0x22, 0x20 };
-       int offset = 1 + (2 * ap->port_no) - adev->devno;
+       int offset = 1 + 2 * ap->port_no - adev->devno;
        int devbits = (2 * ap->port_no + adev->devno) * 4;
        u16 csb5_pio;
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to