diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-25 14:31:35 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-25 14:31:35 -0400 |
| commit | 8937b7349ca9e25a02b2a72ccb7fba404ddedc5b (patch) | |
| tree | 434ffe23d318f8af55850a26c3431ce8b82ab6f4 /drivers/w1 | |
| parent | 997302259f386bca8fe1db67c50296ca426c438f (diff) | |
| parent | ffe7f95bb1a4d1e9ca5d252445dc38476e1a208e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
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 9e1138a75e8b..a411702413d6 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) | |||
| 39 | { | 39 | { |
| 40 | struct w1_gpio_platform_data *pdata = data; | 40 | struct w1_gpio_platform_data *pdata = data; |
| 41 | 41 | ||
| 42 | return gpio_get_value(pdata->pin); | 42 | return gpio_get_value(pdata->pin) ? 1 : 0; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | static int __init w1_gpio_probe(struct platform_device *pdev) | 45 | static int __init w1_gpio_probe(struct platform_device *pdev) |