summaryrefslogtreecommitdiffstats
path: root/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2012-06-20 02:33:16 +0200
committerGreg Kroah-Hartman2012-06-20 02:34:58 +0200
commit95edd09ec3b15b165e2c7ba1e54cc508eafb2321 (patch)
tree7fb38c96bdc89f409e0ba5afcf1a703b01c482ca /drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
parentStaging: add CSR wifi module (diff)
downloadkernel-qcow2-linux-95edd09ec3b15b165e2c7ba1e54cc508eafb2321.tar.gz
kernel-qcow2-linux-95edd09ec3b15b165e2c7ba1e54cc508eafb2321.tar.xz
kernel-qcow2-linux-95edd09ec3b15b165e2c7ba1e54cc508eafb2321.zip
Staging: csr: update to version 5.1.0 of the driver
This brings the in-kernel driver up to the level of the csr-linux-wifi-5.1.0-oss.tar.gz tarball. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c')
-rw-r--r--drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
index 403641d4df02..8bc2d74e8d5e 100644
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
@@ -1,6 +1,6 @@
/*****************************************************************************
- (c) Cambridge Silicon Radio Limited 2011
+ (c) Cambridge Silicon Radio Limited 2012
All rights reserved and confidential information of CSR
Refer to LICENSE.txt included with this source for details
@@ -1565,7 +1565,7 @@ CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, void *pdata,
*/
if (card->chip_id <= SDIO_CARD_ID_UNIFI_2)
{
- unifi_set_host_state(card, UNIFI_HOST_STATE_AWAKE);
+ (void)unifi_set_host_state(card, UNIFI_HOST_STATE_AWAKE);
}
/* If csr_sdio_block_rw() failed in a non-retryable way, or retries exhausted