summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-02 13:52:34 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-04 18:41:49 +0100
commitbf9b94ab924e460459682af8cb3423e8118f9c16 (patch)
tree13bf07a5c1a9ecc2ec874173839a3042674a6e4a
parent[media] drx-j: fix boot failure due to null pointer dereference (diff)
downloadlinux-bf9b94ab924e460459682af8cb3423e8118f9c16.tar.xz
linux-bf9b94ab924e460459682af8cb3423e8118f9c16.zip
[media] drx-j: disable OOB
Just like the windows driver, disable OOB after setting the driver version. Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/dvb-frontends/drx39xyj/drxj.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index 585d891392c3..f7c57c971f8f 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -16676,7 +16676,6 @@ rw_error:
/* Coefficients for the nyquist fitler (total: 27 taps) */
#define NYQFILTERLEN 27
-#if 0
static int ctrl_set_oob(struct drx_demod_instance *demod, struct drxoob *oob_param)
{
int rc;
@@ -17177,6 +17176,8 @@ rw_error:
return -EIO;
}
+#if 0
+
/**
* \fn int ctrl_get_oob()
* \brief Set modulation standard to be used.
@@ -20026,6 +20027,12 @@ int drxj_open(struct drx_demod_instance *demod)
goto rw_error;
}
+ rc = ctrl_set_oob(demod, NULL);
+ if (rc != 0) {
+ pr_err("error %d\n", rc);
+ goto rw_error;
+ }
+
/* refresh the audio data structure with default */
ext_attr->aud_data = drxj_default_aud_data_g;