Skip to content

Commit

Permalink
[PATCH] v4l: (963.1) hybrid v4l/dvb: remove duplicated code
Browse files Browse the repository at this point in the history
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: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Michael Krufky authored and Linus Torvalds committed Nov 14, 2005
1 parent 6555f43 commit 9e1e28d
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/media/video/cx88/cx88-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 9e1e28d

Please sign in to comment.