aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-gpio.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-gpio.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-gpio.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c
index bc8f8ca2961f..676418cbaaad 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/drivers/media/video/ivtv/ivtv-gpio.c
@@ -115,8 +115,7 @@ void ivtv_reset_ir_gpio(struct ivtv *itv)
115 curout = (curout & ~0xF) | 1; 115 curout = (curout & ~0xF) | 1;
116 write_reg(curout, IVTV_REG_GPIO_OUT); 116 write_reg(curout, IVTV_REG_GPIO_OUT);
117 /* We could use something else for smaller time */ 117 /* We could use something else for smaller time */
118 current->state = TASK_INTERRUPTIBLE; 118 schedule_timeout_interruptible(msecs_to_jiffies(1));
119 schedule_timeout(1);
120 curout |= 2; 119 curout |= 2;
121 write_reg(curout, IVTV_REG_GPIO_OUT); 120 write_reg(curout, IVTV_REG_GPIO_OUT);
122 curdir &= ~0x80; 121 curdir &= ~0x80;
@@ -138,13 +137,11 @@ int ivtv_reset_tuner_gpio(enum v4l2_tuner_type mode, void *priv, int ptr)
138 137
139 curout &= ~(1 << 12); 138 curout &= ~(1 << 12);
140 write_reg(curout, IVTV_REG_GPIO_OUT); 139 write_reg(curout, IVTV_REG_GPIO_OUT);
141 current->state = TASK_INTERRUPTIBLE; 140 schedule_timeout_interruptible(msecs_to_jiffies(1));
142 schedule_timeout(1);
143 141
144 curout |= (1 << 12); 142 curout |= (1 << 12);
145 write_reg(curout, IVTV_REG_GPIO_OUT); 143 write_reg(curout, IVTV_REG_GPIO_OUT);
146 current->state = TASK_INTERRUPTIBLE; 144 schedule_timeout_interruptible(msecs_to_jiffies(1));
147 schedule_timeout(1);
148 145
149 return 0; 146 return 0;
150} 147}