Subject: [[email-masked]: [PATCH] staging: ath6kl: Fixing the driver to use modified mmc_host structure

From: Vipin Mehta <[email-masked]>
Date: Wed, 29 Sep 2010 17:34:19 -0700

Stephen,
    Can you pls help me apply the following patch to the linux-next 
tree. The patch fixes a compilation problem with ath6kl due to a
change in the mmc_host structure. The driver compiles fine in the
staging-next-2.6 tree which is where the changes for this driver 
actually go. However, the mmc stack in the linux-next tree and 
staging-next-2.6 is out of sync and so this patch is only applicable
to linux-next.

Regards,
Vipin

----- Forwarded message from Vipin Mehta <[email-masked]> -----

Date: Fri, 17 Sep 2010 18:45:38 -0700
From: Vipin Mehta <[email-masked]>
To: "[email-masked]" <[email-masked]>
CC: "[email-masked]" <[email-masked]>,
	Vipin Mehta <[email-masked]>,
	"[email-masked]" <[email-masked]>,
	"[email-masked]" <[email-masked]>
Subject: [PATCH] staging: ath6kl: Fixing the driver to use modified mmc_host
	structure

A recent change in the mmc_host structure removed the distinction
between hw and phys segments (58cb50c20fde6059f3f8db4466a1bd4d1fff999c)
Changing the driver to use the modified structure.

Reported-by: Randy Dunlap <[email-masked]>
Signed-off-by: Vipin Mehta <[email-masked]>
---
 .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
index 22c6c66..ee8b477 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
@@ -285,9 +285,9 @@ A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_I
     do {
         
             /* check if host supports scatter requests and it meets our requirements */
-        if (device->func->card->host->max_hw_segs < MAX_SCATTER_ENTRIES_PER_REQ) {
+        if (device->func->card->host->max_segs < MAX_SCATTER_ENTRIES_PER_REQ) {
             AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("HIF-SCATTER : host only supports scatter of : %d entries, need: %d \n",
-                    device->func->card->host->max_hw_segs, MAX_SCATTER_ENTRIES_PER_REQ));
+                    device->func->card->host->max_segs, MAX_SCATTER_ENTRIES_PER_REQ));
             status = A_ENOTSUP;
             break;    
         }
-- 
1.6.3.3

----- End forwarded message -----