diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-10 14:10:14 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-10 14:10:14 +1000 |
| commit | 2f03c554a1682a4d6268ef9cd63da592fe6f21b9 (patch) | |
| tree | 11adc3f7fd144488fccc1f228ea02b9a27ccb99f /drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | |
| parent | 78b22b0fa73a440375f71d2717b60f2e943ef3c9 (diff) | |
| parent | dc762c4f8514f23094927e0a62ef305d90651535 (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/rt2860/common/cmm_data_pci.c
drivers/staging/rt2860/common/cmm_data_usb.c
Diffstat (limited to 'drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c')
| -rw-r--r-- | drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 10 |
1 files changed, 5 insertions, 5 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 a1fdcc189f7e..7516d913dab3 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 @@ -309,7 +309,7 @@ int SetupHIFScatterSupport(struct hif_device *device, struct hif_device_scatter_ (MAX_SCATTER_ENTRIES_PER_REQ - 1) * (sizeof(struct hif_scatter_item))); if (NULL == pReqPriv->pHifScatterReq) { - A_FREE(pReqPriv); + kfree(pReqPriv); break; } /* just zero the main part of the scatter request */ @@ -319,8 +319,8 @@ int SetupHIFScatterSupport(struct hif_device *device, struct hif_device_scatter_ /* allocate a bus request for this scatter request */ busrequest = hifAllocateBusRequest(device); if (NULL == busrequest) { - A_FREE(pReqPriv->pHifScatterReq); - A_FREE(pReqPriv); + kfree(pReqPriv->pHifScatterReq); + kfree(pReqPriv); break; } /* assign the scatter request to this bus request */ @@ -382,11 +382,11 @@ void CleanupHIFScatterResources(struct hif_device *device) } if (pReqPriv->pHifScatterReq != NULL) { - A_FREE(pReqPriv->pHifScatterReq); + kfree(pReqPriv->pHifScatterReq); pReqPriv->pHifScatterReq = NULL; } - A_FREE(pReqPriv); + kfree(pReqPriv); } } |