diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-29 01:41:32 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-29 01:41:32 -0700 |
commit | 3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148 (patch) | |
tree | 785e5d697e9c2e4b8fd012a7e9c8aac263c186a5 /drivers/net/wimax/i2400m/sdio.c | |
parent | dfe9a837987aacaffbce020fbf54d8e0afa4bde1 (diff) | |
parent | 7481806dcfd07e9a636155554f6f4b4fbd976381 (diff) | |
download | kernel-crypto-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.tar.gz kernel-crypto-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.tar.xz kernel-crypto-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.zip |
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'drivers/net/wimax/i2400m/sdio.c')
-rw-r--r-- | drivers/net/wimax/i2400m/sdio.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c index 5ac5e76701c..777c981676f 100644 --- a/drivers/net/wimax/i2400m/sdio.c +++ b/drivers/net/wimax/i2400m/sdio.c @@ -409,19 +409,19 @@ int i2400ms_probe(struct sdio_func *func, i2400m->bus_fw_names = i2400ms_bus_fw_names; i2400m->bus_bm_mac_addr_impaired = 1; - result = i2400ms_enable_function(i2400ms->func); - if (result < 0) { - dev_err(dev, "Cannot enable SDIO function: %d\n", result); - goto error_func_enable; - } - sdio_claim_host(func); result = sdio_set_block_size(func, I2400MS_BLK_SIZE); + sdio_release_host(func); if (result < 0) { dev_err(dev, "Failed to set block size: %d\n", result); goto error_set_blk_size; } - sdio_release_host(func); + + result = i2400ms_enable_function(i2400ms->func); + if (result < 0) { + dev_err(dev, "Cannot enable SDIO function: %d\n", result); + goto error_func_enable; + } result = i2400m_setup(i2400m, I2400M_BRI_NO_REBOOT); if (result < 0) { @@ -440,12 +440,12 @@ int i2400ms_probe(struct sdio_func *func, error_debugfs_add: i2400m_release(i2400m); error_setup: - sdio_set_drvdata(func, NULL); sdio_claim_host(func); -error_set_blk_size: sdio_disable_func(func); sdio_release_host(func); error_func_enable: +error_set_blk_size: + sdio_set_drvdata(func, NULL); free_netdev(net_dev); error_alloc_netdev: return result; |