diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-04-08 14:28:13 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-04-08 14:28:13 -0700 |
commit | fd74ea65883c7e6903e9b652795f72b723a2be69 (patch) | |
tree | 0792ad598080eae201d2836ac3c5a8fc46d0d03e /drivers/w1 | |
parent | c8f517c444e4f9f55b5b5ca202b8404691a35805 (diff) | |
parent | 8c6db1bbf80123839ec87bdd6cb364aea384623d (diff) | |
download | op-kernel-dev-fd74ea65883c7e6903e9b652795f72b723a2be69.zip op-kernel-dev-fd74ea65883c7e6903e9b652795f72b723a2be69.tar.gz |
Merge branch 'dmaengine' into async-tx-raid6
Diffstat (limited to 'drivers/w1')
-rw-r--r-- | drivers/w1/masters/w1-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index 9e1138a..a411702 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -39,7 +39,7 @@ static u8 w1_gpio_read_bit(void *data) { struct w1_gpio_platform_data *pdata = data; - return gpio_get_value(pdata->pin); + return gpio_get_value(pdata->pin) ? 1 : 0; } static int __init w1_gpio_probe(struct platform_device *pdev) |