aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2005-11-09 00:35:47 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:05 -0500
commitc6dd2d5d61b000509e3a7f6c06778b16a4ef10ba (patch)
tree4308921df9c0ecdefdb740941bcea945ad8959c1 /drivers/media/dvb
parent04a45929e7f00ed4fc7b1d375397f808c8a5d0eb (diff)
[PATCH] dvb: nxt200x: check callback fix
Check that a callback (set_ts_params) is set before calling it. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Cc: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/frontends/nxt200x.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index 1d729be9b75c..d1b9f8b9b437 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -557,14 +557,16 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
557 case QAM_256: 557 case QAM_256:
558 /* Set punctured clock for QAM */ 558 /* Set punctured clock for QAM */
559 /* This is just a guess since I am unable to test it */ 559 /* This is just a guess since I am unable to test it */
560 state->config->set_ts_params(fe, 1); 560 if (state->config->set_ts_params)
561 state->config->set_ts_params(fe, 1);
561 562
562 /* set to use cable input */ 563 /* set to use cable input */
563 buf[3] |= 0x08; 564 buf[3] |= 0x08;
564 break; 565 break;
565 case VSB_8: 566 case VSB_8:
566 /* Set non-punctured clock for VSB */ 567 /* Set non-punctured clock for VSB */
567 state->config->set_ts_params(fe, 0); 568 if (state->config->set_ts_params)
569 state->config->set_ts_params(fe, 0);
568 break; 570 break;
569 default: 571 default:
570 return -EINVAL; 572 return -EINVAL;