* linux-next: manual merge of the workqueues tree with the v4l-dvb tree
@ 2010-12-27 4:38 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2010-12-27 4:38 UTC (permalink / raw)
To: Tejun Heo
Cc: linux-next, linux-kernel, David Härdeman,
Mauro Carvalho Chehab
Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
drivers/media/video/bt8xx/bttv-input.c between commit
ed6ff10ea4e8748adad312c758ff12099cec6930 ("[media] bttv: merge ir
decoding timers") from the v4l-dvb tree and commit
8c71778cbf2c8beaefaa2dee5478aa0622d96682 ("media/video: don't use
flush_scheduled_work()") from the workqueues tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/media/video/bt8xx/bttv-input.c
index 7f48306,1989f00..0000000
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@@ -327,8 -235,7 +325,7 @@@ static void bttv_ir_stop(struct bttv *b
if (btv->remote->rc5_gpio) {
u32 gpio;
- del_timer_sync(&btv->remote->timer_end);
+ del_timer_sync(&btv->remote->timer);
- flush_scheduled_work();
gpio = bttv_gpio_read(&btv->c);
bttv_gpio_write(&btv->c, gpio & ~(1 << 4));
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-12-27 4:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-27 4:38 linux-next: manual merge of the workqueues tree with the v4l-dvb tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).