summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSeung-Woo Kim <sw0312.kim@samsung.com>2014-05-15 12:30:43 +0900
committerChanho Park <chanho61.park@samsung.com>2014-11-18 12:00:32 +0900
commit774dab1751b19d4315ce8b94895fe84d6aee9c5f (patch)
treefc16fe91b9ab9f04d81e39537467647966ea700f /net
parent8e2adc3b549ccc5e3a886a00dd2b5d9a8ebe2c83 (diff)
downloadlinux-3.10-774dab1751b19d4315ce8b94895fe84d6aee9c5f.tar.gz
linux-3.10-774dab1751b19d4315ce8b94895fe84d6aee9c5f.tar.bz2
linux-3.10-774dab1751b19d4315ce8b94895fe84d6aee9c5f.zip
net: rfkill-gpio: fix initial state as blocked
WORKAROUND: Temporary worgaround for bluetooth enable. Initial state is not set as blocked, so it is always unblocked after booting. This patch fixes initual state of rfkill-gpio as blocked. Change-Id: Ide67763d10e2ef3ea75fe58d917cd725b26e2cab Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Diffstat (limited to 'net')
-rw-r--r--net/rfkill/rfkill-gpio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index ad5c956f1ea..212a77f38f2 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -164,12 +164,16 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
if (!rfkill->rfkill_dev)
return -ENOMEM;
+ rfkill_init_sw_state(rfkill->rfkill_dev, false);
+
ret = rfkill_register(rfkill->rfkill_dev);
if (ret < 0)
return ret;
platform_set_drvdata(pdev, rfkill);
+ rfkill_set_sw_state(rfkill->rfkill_dev, true);
+
dev_info(&pdev->dev, "%s device registered.\n", rfkill->name);
return 0;