diff options
author | Luciano Coelho <coelho@ti.com> | 2013-01-23 09:40:37 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2013-02-08 03:05:02 -0500 |
commit | 06ab4058ea418d8503458bea386961b9dd554356 (patch) | |
tree | 9175464b244a7dd745d2fbfc2a0ae1da5ef3f691 /drivers/net/wireless/ti | |
parent | 91147a6cd0f599e1e2f5a904c37d73df58f9508f (diff) |
wlcore: use PLATFORM_DEVID_AUTO for plat dev creation to avoid conflicts
The platform devices can be created by both wlcore_sdio and
wlcore_spi. Theoretically, if both are connected to the same board,
there will be a conflict.
Reported-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti')
-rw-r--r-- | drivers/net/wireless/ti/wlcore/sdio.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ti/wlcore/spi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c index 6d2884f040c7..198028df6f4b 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c | |||
@@ -280,7 +280,7 @@ static int wl1271_probe(struct sdio_func *func, | |||
280 | else | 280 | else |
281 | chip_family = "wl12xx"; | 281 | chip_family = "wl12xx"; |
282 | 282 | ||
283 | glue->core = platform_device_alloc(chip_family, -1); | 283 | glue->core = platform_device_alloc(chip_family, PLATFORM_DEVID_AUTO); |
284 | if (!glue->core) { | 284 | if (!glue->core) { |
285 | dev_err(glue->dev, "can't allocate platform_device"); | 285 | dev_err(glue->dev, "can't allocate platform_device"); |
286 | ret = -ENOMEM; | 286 | ret = -ENOMEM; |
diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c index d62a20b99190..5ad2e100e59b 100644 --- a/drivers/net/wireless/ti/wlcore/spi.c +++ b/drivers/net/wireless/ti/wlcore/spi.c | |||
@@ -366,7 +366,7 @@ static int wl1271_probe(struct spi_device *spi) | |||
366 | goto out_free_glue; | 366 | goto out_free_glue; |
367 | } | 367 | } |
368 | 368 | ||
369 | glue->core = platform_device_alloc("wl12xx", -1); | 369 | glue->core = platform_device_alloc("wl12xx", PLATFORM_DEVID_AUTO); |
370 | if (!glue->core) { | 370 | if (!glue->core) { |
371 | dev_err(glue->dev, "can't allocate platform_device\n"); | 371 | dev_err(glue->dev, "can't allocate platform_device\n"); |
372 | ret = -ENOMEM; | 372 | ret = -ENOMEM; |