X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Foxnas%2Fpatches-3.18%2F999-libata-hacks.patch;h=a1c80d89eb9d184d74dd6577e21ce7b2ef8fd1aa;hb=7de0c479a65f6332010aac072da3cf533f195b99;hp=39d9e51cf02418ab57d3a01643783e62c1e2b1d0;hpb=874a0c9ffabd1627bc5148367ccdeb59cb52648e;p=openwrt.git

diff --git a/target/linux/oxnas/patches-3.18/999-libata-hacks.patch b/target/linux/oxnas/patches-3.18/999-libata-hacks.patch
index 39d9e51cf0..a1c80d89eb 100644
--- a/target/linux/oxnas/patches-3.18/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-3.18/999-libata-hacks.patch
@@ -6,9 +6,9 @@ Index: linux-3.18-rc7/drivers/ata/libata-core.c
  		return AC_ERR_SYSTEM;
  	}
  
-+	if (ap->ops->acquire_hw && !ap->ops->acquire_hw(ap->port_no, 0, 0)) {
++	if (ap->ops->acquire_hw && !ap->ops->acquire_hw(ap, 0, 0)) {
 +		spin_unlock_irqrestore(ap->lock, flags);
-+		if (!ap->ops->acquire_hw(ap->port_no, 1, (2*HZ))) {
++		if (!ap->ops->acquire_hw(ap, 1, (2*HZ))) {
 +			return AC_ERR_TIMEOUT;
 +		}
 +		spin_lock_irqsave(ap->lock, flags);
@@ -49,11 +49,12 @@ Index: linux-3.18-rc7/include/linux/libata.h
  
  	/*
  	 * Configuration and exception handling
-@@ -974,6 +976,8 @@ struct ata_port_operations {
+@@ -974,6 +976,9 @@ struct ata_port_operations {
  	void (*phy_reset)(struct ata_port *ap);
  	void (*eng_timeout)(struct ata_port *ap);
  
-+	int (*acquire_hw)(int port_no, int may_sleep, int timeout_jiffies);
++	int (*acquire_hw)(struct ata_port *ap, int may_sleep,
++			  int timeout_jiffies);
 +
  	/*
  	 * ->inherits must be the last field and all the preceding