KARO: cleanup after merge of Freescale 3.10.17 stuff

[karo-tx-linux.git] / drivers / net / wireless / ath / ath6kl / sdio.c

diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index 2a025e69ff89fe6e621c3c7afad6f1fea13c8df3..339d89f14d32b1991c3d3d646f460b90f41411bb 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -222,7 +222,6 @@ static void ath6kl_sdio_setup_scat_data(struct hif_scatter_req *scat_req,
                                        struct mmc_data *data)
 {
        struct scatterlist *sg;
-       struct hif_scatter_item *scat_list;
        int i;
 
        data->blksz = HIF_MBOX_BLOCK_SIZE;
@@ -241,14 +240,14 @@ static void ath6kl_sdio_setup_scat_data(struct hif_scatter_req *scat_req,
        sg = scat_req->sgentries;
        sg_init_table(sg, scat_req->scat_entries);
 
-       scat_list = &scat_req->scat_list[0];
-
        /* assemble SG list */
-       for (i = 0; i < scat_req->scat_entries; i++, sg++, scat_list++) {
+       for (i = 0; i < scat_req->scat_entries; i++, sg++) {
                ath6kl_dbg(ATH6KL_DBG_SCATTER, "%d: addr:0x%p, len:%d\n",
-                          i, scat_list->buf, scat_list->len);
+                          i, scat_req->scat_list[i].buf,
+                          scat_req->scat_list[i].len);
 
-               sg_set_buf(sg, scat_list->buf, scat_list->len);
+               sg_set_buf(sg, scat_req->scat_list[i].buf,
+                          scat_req->scat_list[i].len);
        }
 
        /* set scatter-gather table for request */