aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7164/saa7164-cmd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-cmd.c')
-rw-r--r--drivers/media/video/saa7164/saa7164-cmd.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
index 301a9e302f45..a97ae17b36c2 100644
--- a/drivers/media/video/saa7164/saa7164-cmd.c
+++ b/drivers/media/video/saa7164/saa7164-cmd.c
@@ -122,8 +122,8 @@ int saa7164_irq_dequeue(struct saa7164_dev *dev)
122 return ret; 122 return ret;
123 } 123 }
124 124
125 /* It's unlikely to have more than 4 or 5 pending messages, ensure we exit 125 /* It's unlikely to have more than 4 or 5 pending messages,
126 * at some point regardles. 126 * ensure we exit at some point regardless.
127 */ 127 */
128 } while (i++ < 32); 128 } while (i++ < 32);
129 129
@@ -186,7 +186,8 @@ int saa7164_cmd_dequeue(struct saa7164_dev *dev)
186 return SAA_OK; 186 return SAA_OK;
187} 187}
188 188
189int saa7164_cmd_set(struct saa7164_dev *dev, struct tmComResInfo* msg, void *buf) 189int saa7164_cmd_set(struct saa7164_dev *dev, struct tmComResInfo *msg,
190 void *buf)
190{ 191{
191 struct tmComResBusInfo *bus = &dev->bus; 192 struct tmComResBusInfo *bus = &dev->bus;
192 u8 cmd_sent; 193 u8 cmd_sent;
@@ -292,7 +293,8 @@ int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
292 * We typically are signalled in < 50ms but it can 293 * We typically are signalled in < 50ms but it can
293 * take MUCH longer. 294 * take MUCH longer.
294 */ 295 */
295 wait_event_timeout(*q, dev->cmds[seqno].signalled, (HZ * waitsecs)); 296 wait_event_timeout(*q, dev->cmds[seqno].signalled,
297 (HZ * waitsecs));
296 r = time_before(jiffies, stamp + (HZ * waitsecs)); 298 r = time_before(jiffies, stamp + (HZ * waitsecs));
297 if (r) 299 if (r)
298 ret = SAA_OK; 300 ret = SAA_OK;