diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-11 15:39:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-11 15:39:21 -0400 |
| commit | 9687c637388f63b87fcc18eee6e65bcfca4f49ca (patch) | |
| tree | 0929bb8dc602c4f86b6b2e95bca94015de2b0868 /net/rfkill/rfkill-gpio.c | |
| parent | 258daca2bc9f97ace65c9480c901fddfce1e20cf (diff) | |
| parent | 094daf7db7c47861009899ce23f9177d761e20b0 (diff) | |
Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next
Diffstat (limited to 'net/rfkill/rfkill-gpio.c')
| -rw-r--r-- | net/rfkill/rfkill-gpio.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 256c5ddd2d72..128677d69056 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -101,6 +101,14 @@ static int rfkill_gpio_probe(struct platform_device *pdev) if (!rfkill) return -ENOMEM; + if (pdata->gpio_runtime_setup) { + ret = pdata->gpio_runtime_setup(pdev); + if (ret) { + pr_warn("%s: can't set up gpio\n", __func__); + return ret; + } + } + rfkill->pdata = pdata; len = strlen(pdata->name); @@ -182,7 +190,10 @@ fail_alloc: static int rfkill_gpio_remove(struct platform_device *pdev) { struct rfkill_gpio_data *rfkill = platform_get_drvdata(pdev); + struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data; + if (pdata->gpio_runtime_close) + pdata->gpio_runtime_close(pdev); rfkill_unregister(rfkill->rfkill_dev); rfkill_destroy(rfkill->rfkill_dev); if (gpio_is_valid(rfkill->pdata->shutdown_gpio)) |