diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-24 08:31:04 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-24 08:31:04 -0200 |
| commit | c73a2ef55808dad64c72bdc00490c63333b8351c (patch) | |
| tree | ecd081607cf8afbd93d3716164fd4eb9cf5531b1 /linux/drivers/media/video/cx18/cx18-gpio.c | |
| parent | b0d6553d68b8a1ffded1620af3daf811d387fa31 (diff) | |
| parent | 752b7bb4231bff537eda1576e55e26ed7a363e38 (diff) | |
| download | mediapointer-dvb-s2-c73a2ef55808dad64c72bdc00490c63333b8351c.tar.gz mediapointer-dvb-s2-c73a2ef55808dad64c72bdc00490c63333b8351c.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-gpio.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-gpio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-gpio.c b/linux/drivers/media/video/cx18/cx18-gpio.c index 17b7a32fc..1a99329f3 100644 --- a/linux/drivers/media/video/cx18/cx18-gpio.c +++ b/linux/drivers/media/video/cx18/cx18-gpio.c @@ -4,6 +4,7 @@ * Derived from ivtv-gpio.c * * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl> + * Copyright (C) 2008 Andy Walls <awalls@radix.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -60,8 +61,6 @@ static void gpio_write(struct cx18 *cx) CX18_REG_GPIO_DIR2, ~dir_hi, dir_hi); cx18_write_reg_expect(cx, (dir_hi << 16) | val_hi, CX18_REG_GPIO_OUT2, val_hi, dir_hi); - if (!cx18_retry_mmio) - (void) cx18_read_reg(cx, CX18_REG_GPIO_OUT2); /* sync */ } void cx18_reset_i2c_slaves_gpio(struct cx18 *cx) |