提交 9e1e28da 编写于 作者: M Michael Krufky 提交者: Linus Torvalds

[PATCH] v4l: (963.1) hybrid v4l/dvb: remove duplicated code

The following patch caused some duplicated code in cx88-dvb.c:
[PATCH] v4l: 634: implemented tuner set standby on cx88 init

The cx88-dvb.c portion of this patch was already applied
in an earlier patch, entitled:
[PATCH] v4l: fixup on cx88_dvb for Dvico HDTV5 Gold

I love quilt and all, but AFAIK, no tool is 100% perfect for catching
oversights like this.

The non-overlapping portions of each of these patches are still needed, and
must not be discarded, so rather than reverting old patches, please just apply
this fixup patch to remove the duplicated code.
Signed-off-by: NMichael Krufky <mkrufky@m1k.net>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 6555f432
......@@ -439,9 +439,6 @@ static int dvb_register(struct cx8802_dev *dev)
/* Put the analog decoder in standby to keep it quiet */
cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
/* Put the analog decoder in standby to keep it quiet */
cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
/* register everything */
return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册