diff options
| author | Nagarjuna Kristam <nkristam@nvidia.com> | 2014-06-24 20:37:30 +0530 |
|---|---|---|
| committer | Emad Mir <emir@nvidia.com> | 2014-06-25 11:21:12 -0700 |
| commit | 70f1f8715cbfe8cba5a85b68e0131e8f029379dc (patch) | |
| tree | dcc19a7971305d3a209eb7753e8048a97fcf6524 /drivers/net | |
| parent | 66f03b7272d21a418f4b42d6affc008b19c968e9 (diff) | |
net: wireless: bcmdhd: correct sdio_ids
Usage of SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_ANY_ID) is
causing device hang when BRCM chipsets BCM433341 are used.
This is because SDIO_DEVICE MACRO uses, SDIO_ANY_ID for class.
Use SDIO_CLASS_NONE instead resolves device hang issue.
Bug 1527370
Change-Id: I9af6e7598893663afa7629e822a5934f12c128fa
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Reviewed-on: http://git-master/r/427780
(cherry picked from commit eab2794d3420cc31218709410afd0feab48ced6b)
Reviewed-on: http://git-master/r/427779
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/net')
| -rwxr-xr-x | drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c index 1cfb1bfbf834..e8c1958d1be9 100755 --- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c @@ -225,17 +225,11 @@ static void bcmsdh_sdmmc_remove(struct sdio_func *func) /* devices we support, null terminated */ static const struct sdio_device_id bcmsdh_sdmmc_ids[] = { - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_DEFAULT) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4325_SDGWB) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4325) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4319) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4324) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43239) }, - { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_ANY_ID) }, - { /* end: all zeroes */ }, + { .class = SDIO_CLASS_NONE, + .vendor = SDIO_VENDOR_ID_BROADCOM, + .device = SDIO_ANY_ID + }, + { /* end: all zeroes */ }, }; MODULE_DEVICE_TABLE(sdio, bcmsdh_sdmmc_ids); |