diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-05 10:12:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-05 10:13:24 -0500 |
| commit | 1032c736e81cdf490ae62f86da7efe67c3c3e61d (patch) | |
| tree | a0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73 /net/rfkill | |
| parent | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (diff) | |
| parent | cb00ec382b57d35b955c085198cd54a0c1fcdc94 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43legacy/dma.c
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/rfkill-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index ca355e7e58b4..865adb61685a 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c | |||
| @@ -105,7 +105,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev) | |||
| 105 | ret = pdata->gpio_runtime_setup(pdev); | 105 | ret = pdata->gpio_runtime_setup(pdev); |
| 106 | if (ret) { | 106 | if (ret) { |
| 107 | pr_warn("%s: can't set up gpio\n", __func__); | 107 | pr_warn("%s: can't set up gpio\n", __func__); |
| 108 | return ret; | 108 | goto fail_alloc; |
| 109 | } | 109 | } |
| 110 | } | 110 | } |
| 111 | 111 | ||