summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-streams.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-14 11:08:53 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-02-14 11:08:53 -0700
commitb214b7bbffca8ac6a6f1dad46408f7a9d4219098 (patch)
tree2ef03e062e2a04ea9f2d5439b0daea5274a1bc98 /drivers/media/video/cx18/cx18-streams.h
parent7d48ec3698e7b747efa744fd340b0f2d1dbfd3e0 (diff)
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff)
Merge commit 'v2.6.38-rc4' into spi/next
Diffstat (limited to 'drivers/media/video/cx18/cx18-streams.h')
-rw-r--r--drivers/media/video/cx18/cx18-streams.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-streams.h b/drivers/media/video/cx18/cx18-streams.h
index 51765eb12d3..713b0e61536 100644
--- a/drivers/media/video/cx18/cx18-streams.h
+++ b/drivers/media/video/cx18/cx18-streams.h
@@ -42,8 +42,7 @@ static inline bool cx18_stream_enabled(struct cx18_stream *s)
/* Related to submission of mdls to firmware */
static inline void cx18_stream_load_fw_queue(struct cx18_stream *s)
{
- struct cx18 *cx = s->cx;
- queue_work(cx->out_work_queue, &s->out_work_order);
+ schedule_work(&s->out_work_order);
}
static inline void cx18_stream_put_mdl_fw(struct cx18_stream *s,