From: gwl Date: Wed, 26 Mar 2014 10:29:43 +0000 (+0800) Subject: Wifi:BT: fix rfkill bug. X-Git-Tag: firefly_0821_release~5801 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6ac743d10568ea3ac2c1278323186b4949142f6e;p=firefly-linux-kernel-4.4.55.git Wifi:BT: fix rfkill bug. --- diff --git a/net/rfkill/rfkill-bt.c b/net/rfkill/rfkill-bt.c index 06c666a598eb..04dd9538bbb3 100755 --- a/net/rfkill/rfkill-bt.c +++ b/net/rfkill/rfkill-bt.c @@ -462,25 +462,25 @@ static int bluetooth_platdata_parse_dt(struct device *dev, data->poweron_gpio.io = gpio; data->poweron_gpio.enable = (flags == GPIO_ACTIVE_HIGH)? 1:0; LOG("%s: get property: BT,power_gpio = %d.\n", __func__, gpio); - } + } else data->poweron_gpio.io = -1; gpio = of_get_named_gpio_flags(node, "BT,reset_gpio", 0, &flags); if (gpio_is_valid(gpio)){ data->reset_gpio.io = gpio; data->reset_gpio.enable = (flags == GPIO_ACTIVE_HIGH)? 1:0; LOG("%s: get property: BT,reset_gpio = %d.\n", __func__, gpio); - } + } else data->reset_gpio.io = -1; gpio = of_get_named_gpio_flags(node, "BT,wake_gpio", 0, &flags); if (gpio_is_valid(gpio)){ data->wake_gpio.io = gpio; data->wake_gpio.enable = (flags == GPIO_ACTIVE_HIGH)? 1:0; LOG("%s: get property: BT,wake_gpio = %d.\n", __func__, gpio); - } + } else data->wake_gpio.io = -1; gpio = of_get_named_gpio_flags(node, "BT,wake_host_irq", 0, &flags); if (gpio_is_valid(gpio)) { data->wake_host_irq.gpio.io = gpio; data->wake_host_irq.gpio.enable = flags; LOG("%s: get property: BT,wake_host_irq = %d.\n", __func__, gpio); - } + } else data->wake_host_irq.gpio.io = -1; return 0; }