adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

wimax/i2400m: sdio: set the block size before enabling the function

Browse source 
From a fix by Cindy H Kao:

  Block size has to be set before sending IOE enable because the
  firmware reads the block size register before it reads IOE register.

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
This commit is contained in:
Inaky Perez-Gonzalez 2009-04-30 14:39:21 -07:00
parent 52a8d96308
commit a0a4c4c9e5
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/net/wimax/i2400m/sdio.c
View file

@ -409,20 +409,20 @@ int i2400ms_probe(struct sdio_func *func,
i2400m->bus_fw_names = i2400ms_bus_fw_names; i2400m->bus_fw_names = i2400ms_bus_fw_names;
i2400m->bus_bm_mac_addr_impaired = 1; i2400m->bus_bm_mac_addr_impaired = 1;
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;
}
result = i2400ms_enable_function(i2400ms->func); result = i2400ms_enable_function(i2400ms->func);
if (result < 0) { if (result < 0) {
dev_err(dev, "Cannot enable SDIO function: %d\n", result); dev_err(dev, "Cannot enable SDIO function: %d\n", result);
goto error_func_enable; goto error_func_enable;
} }
sdio_claim_host(func);
result = sdio_set_block_size(func, I2400MS_BLK_SIZE);
if (result < 0) {
dev_err(dev, "Failed to set block size: %d\n", result);
goto error_set_blk_size;
}
sdio_release_host(func);
result = i2400m_setup(i2400m, I2400M_BRI_NO_REBOOT); result = i2400m_setup(i2400m, I2400M_BRI_NO_REBOOT);
if (result < 0) { if (result < 0) {
dev_err(dev, "cannot setup device: %d\n", result); dev_err(dev, "cannot setup device: %d\n", result);
@ -440,12 +440,12 @@ int i2400ms_probe(struct sdio_func *func,
error_debugfs_add: error_debugfs_add:
i2400m_release(i2400m); i2400m_release(i2400m);
error_setup: error_setup:
sdio_set_drvdata(func, NULL);
sdio_claim_host(func); sdio_claim_host(func);
error_set_blk_size:
sdio_disable_func(func); sdio_disable_func(func);
sdio_release_host(func); sdio_release_host(func);
error_func_enable: error_func_enable:
error_set_blk_size:
sdio_set_drvdata(func, NULL);
free_netdev(net_dev); free_netdev(net_dev);
error_alloc_netdev: error_alloc_netdev:
return result; return result;