Skip to content

L
linux
Commit f2709c20 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

Revert "[media] dvb_frontend: merge duplicate dvb_tuner_ops.release implementations" 

While this patch sounded a good idea, unfortunately, it causes
bad dependencies, as drivers that would otherwise work without
the DVB core will now break:

ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/tea5767.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/tea5761.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/tda827x.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/tda18218.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/qt1010.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/mt2266.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/mt20xx.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/mt2060.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/mc44s803.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/fc0013.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/fc0012.ko] undefined!
ERROR: "dvb_tuner_simple_release" [drivers/media/tuners/fc0011.ko] undefined!

So, we have to revert it.

Note: as the argument for the release ops changed from "int"
to "void", we needed to change it at the revert patch, to
avoid compilation issues like:
	drivers/media/tuners/tea5767.c:437:23: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
	  .release           = tea5767_release,
	                       ^~~~~~~~~~~~~~~

This reverts commit 22a613e8.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a4afb3ed
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 45 deletions
drivers/media/dvb-core/dvb_frontend.c
View file @ f2709c20
......@@ -181,14 +181,6 @@ static bool has_get_frontend(struct dvb_frontend *fe)
return fe->ops.get_frontend != NULL;
}
void
dvb_tuner_simple_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
EXPORT_SYMBOL(dvb_tuner_simple_release);
/*
* Due to DVBv3 API calls, a delivery system should be mapped into one of
* the 4 DVBv3 delivery systems (FE_QPSK, FE_QAM, FE_OFDM or FE_ATSC),
......
drivers/media/dvb-core/dvb_frontend.h
View file @ f2709c20
......@@ -266,13 +266,6 @@ struct dvb_tuner_ops {
int (*set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth);
};
/**
* A common default implementation for dvb_tuner_ops.release. All it
* does is kfree() the tuner_priv and assign NULL to it.
*/
void
dvb_tuner_simple_release(struct dvb_frontend *fe);
/**
* struct analog_demod_info - Information struct for analog TV part of the demod
*
......
drivers/media/dvb-frontends/dib0070.c
View file @ f2709c20
......@@ -722,6 +722,12 @@ static int dib0070_get_frequency(struct dvb_frontend *fe, u32 *frequency)
return 0;
}
static void dib0070_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static const struct dvb_tuner_ops dib0070_ops = {
.info = {
.name = "DiBcom DiB0070",
......@@ -729,7 +735,7 @@ static const struct dvb_tuner_ops dib0070_ops = {
.frequency_max = 860000000,
.frequency_step = 1000,
},
.release = dvb_tuner_simple_release,
.release = dib0070_release,
.init = dib0070_wakeup,
.sleep = dib0070_sleep,
......
drivers/media/dvb-frontends/dib0090.c
View file @ f2709c20
......@@ -2526,6 +2526,12 @@ static int dib0090_tune(struct dvb_frontend *fe)
return ret;
}
static void dib0090_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
enum frontend_tune_state dib0090_get_tune_state(struct dvb_frontend *fe)
{
struct dib0090_state *state = fe->tuner_priv;
......@@ -2587,7 +2593,7 @@ static const struct dvb_tuner_ops dib0090_ops = {
.frequency_max = 860000000,
.frequency_step = 1000,
},
.release = dvb_tuner_simple_release,
.release = dib0090_release,
.init = dib0090_wakeup,
.sleep = dib0090_sleep,
......@@ -2602,7 +2608,7 @@ static const struct dvb_tuner_ops dib0090_fw_ops = {
.frequency_max = 860000000,
.frequency_step = 1000,
},
.release = dvb_tuner_simple_release,
.release = dib0090_release,
.init = NULL,
.sleep = NULL,
......
drivers/media/dvb-frontends/dvb-pll.c
View file @ f2709c20
......@@ -606,6 +606,12 @@ static int dvb_pll_configure(struct dvb_frontend *fe, u8 *buf,
return (div * desc->entries[i].stepsize) - desc->iffreq;
}
static void dvb_pll_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int dvb_pll_sleep(struct dvb_frontend *fe)
{
struct dvb_pll_priv *priv = fe->tuner_priv;
......@@ -738,7 +744,7 @@ static int dvb_pll_init(struct dvb_frontend *fe)
}
static const struct dvb_tuner_ops dvb_pll_tuner_ops = {
.release = dvb_tuner_simple_release,
.release = dvb_pll_release,
.sleep = dvb_pll_sleep,
.init = dvb_pll_init,
.set_params = dvb_pll_set_params,
......
drivers/media/dvb-frontends/itd1000.c
View file @ f2709c20
......@@ -348,6 +348,12 @@ static int itd1000_sleep(struct dvb_frontend *fe)
return 0;
}
static void itd1000_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static const struct dvb_tuner_ops itd1000_tuner_ops = {
.info = {
.name = "Integrant ITD1000",
......@@ -356,7 +362,7 @@ static const struct dvb_tuner_ops itd1000_tuner_ops = {
.frequency_step = 125, /* kHz for QPSK frontends */
},
.release = dvb_tuner_simple_release,
.release = itd1000_release,
.init = itd1000_init,
.sleep = itd1000_sleep,
......
drivers/media/dvb-frontends/ix2505v.c
View file @ f2709c20
......@@ -94,6 +94,15 @@ static int ix2505v_write(struct ix2505v_state *state, u8 buf[], u8 count)
return 0;
}
static void ix2505v_release(struct dvb_frontend *fe)
{
struct ix2505v_state *state = fe->tuner_priv;
fe->tuner_priv = NULL;
kfree(state);
}
/**
* Data write format of the Sharp IX2505V B0017
*
......@@ -254,7 +263,7 @@ static const struct dvb_tuner_ops ix2505v_tuner_ops = {
.frequency_min = 950000,
.frequency_max = 2175000
},
.release = dvb_tuner_simple_release,
.release = ix2505v_release,
.set_params = ix2505v_set_params,
.get_frequency = ix2505v_get_frequency,
};
......
drivers/media/dvb-frontends/stb6000.c
View file @ f2709c20
......@@ -41,6 +41,12 @@ struct stb6000_priv {
u32 frequency;
};
static void stb6000_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int stb6000_sleep(struct dvb_frontend *fe)
{
struct stb6000_priv *priv = fe->tuner_priv;
......@@ -185,7 +191,7 @@ static const struct dvb_tuner_ops stb6000_tuner_ops = {
.frequency_min = 950000,
.frequency_max = 2150000
},
.release = dvb_tuner_simple_release,
.release = stb6000_release,
.sleep = stb6000_sleep,
.set_params = stb6000_set_params,
.get_frequency = stb6000_get_frequency,
......
drivers/media/dvb-frontends/stb6100.c
View file @ f2709c20
......@@ -61,6 +61,8 @@ struct stb6100_lkup {
u8 reg;
};
static void stb6100_release(struct dvb_frontend *fe);
static const struct stb6100_lkup lkup[] = {
{ 0, 950000, 0x0a },
{ 950000, 1000000, 0x0a },
......@@ -534,7 +536,7 @@ static const struct dvb_tuner_ops stb6100_ops = {
.set_params = stb6100_set_params,
.get_frequency = stb6100_get_frequency,
.get_bandwidth = stb6100_get_bandwidth,
.release = dvb_tuner_simple_release
.release = stb6100_release
};
struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
......@@ -558,6 +560,14 @@ struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
return fe;
}
static void stb6100_release(struct dvb_frontend *fe)
{
struct stb6100_state *state = fe->tuner_priv;
fe->tuner_priv = NULL;
kfree(state);
}
EXPORT_SYMBOL(stb6100_attach);
MODULE_PARM_DESC(verbose, "Set Verbosity level");
......
drivers/media/dvb-frontends/stv6110.c
View file @ f2709c20
......@@ -59,6 +59,12 @@ static s32 abssub(s32 a, s32 b)
return b - a;
};
static void stv6110_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int stv6110_write_regs(struct dvb_frontend *fe, u8 buf[],
int start, int len)
{
......@@ -383,7 +389,7 @@ static const struct dvb_tuner_ops stv6110_tuner_ops = {
.frequency_step = 1000,
},
.init = stv6110_init,
.release = dvb_tuner_simple_release,
.release = stv6110_release,
.sleep = stv6110_sleep,
.set_params = stv6110_set_params,
.get_frequency = stv6110_get_frequency,
......
drivers/media/dvb-frontends/stv6110x.c
View file @ f2709c20
......@@ -335,6 +335,14 @@ static int stv6110x_get_status(struct dvb_frontend *fe, u32 *status)
}
static void stv6110x_release(struct dvb_frontend *fe)
{
struct stv6110x_state *stv6110x = fe->tuner_priv;
fe->tuner_priv = NULL;
kfree(stv6110x);
}
static const struct dvb_tuner_ops stv6110x_ops = {
.info = {
.name = "STV6110(A) Silicon Tuner",
......@@ -342,7 +350,7 @@ static const struct dvb_tuner_ops stv6110x_ops = {
.frequency_max = 2150000,
.frequency_step = 0,
},
.release = dvb_tuner_simple_release,
.release = stv6110x_release
};
static const struct stv6110x_devctl stv6110x_ctl = {
......
drivers/media/dvb-frontends/tda18271c2dd.c
View file @ f2709c20
......@@ -1126,6 +1126,13 @@ static int init(struct dvb_frontend *fe)
return 0;
}
static void release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int set_params(struct dvb_frontend *fe)
{
struct tda_state *state = fe->tuner_priv;
......@@ -1219,7 +1226,7 @@ static const struct dvb_tuner_ops tuner_ops = {
.init = init,
.sleep = sleep,
.set_params = set_params,
.release = dvb_tuner_simple_release,
.release = release,
.get_if_frequency = get_if_frequency,
.get_bandwidth = get_bandwidth,
};
......
drivers/media/dvb-frontends/tda665x.c
View file @ f2709c20
......@@ -197,11 +197,19 @@ static int tda665x_set_params(struct dvb_frontend *fe)
return 0;
}
static void tda665x_release(struct dvb_frontend *fe)
{
struct tda665x_state *state = fe->tuner_priv;
fe->tuner_priv = NULL;
kfree(state);
}
static const struct dvb_tuner_ops tda665x_ops = {
.get_status = tda665x_get_status,
.set_params = tda665x_set_params,
.get_frequency = tda665x_get_frequency,
.release = dvb_tuner_simple_release,
.release = tda665x_release
};
struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe,
......
drivers/media/dvb-frontends/tda8261.c
View file @ f2709c20
......@@ -152,6 +152,14 @@ static int tda8261_set_params(struct dvb_frontend *fe)
return 0;
}
static void tda8261_release(struct dvb_frontend *fe)
{
struct tda8261_state *state = fe->tuner_priv;
fe->tuner_priv = NULL;
kfree(state);
}
static const struct dvb_tuner_ops tda8261_ops = {
.info = {
......@@ -164,7 +172,7 @@ static const struct dvb_tuner_ops tda8261_ops = {
.set_params = tda8261_set_params,
.get_frequency = tda8261_get_frequency,
.get_status = tda8261_get_status,
.release = dvb_tuner_simple_release,
.release = tda8261_release
};
struct dvb_frontend *tda8261_attach(struct dvb_frontend *fe,
......
drivers/media/dvb-frontends/tda826x.c
View file @ f2709c20
......@@ -41,6 +41,12 @@ struct tda826x_priv {
u32 frequency;
};
static void tda826x_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int tda826x_sleep(struct dvb_frontend *fe)
{
struct tda826x_priv *priv = fe->tuner_priv;
......@@ -128,7 +134,7 @@ static const struct dvb_tuner_ops tda826x_tuner_ops = {
.frequency_min = 950000,
.frequency_max = 2175000
},
.release = dvb_tuner_simple_release,
.release = tda826x_release,
.sleep = tda826x_sleep,
.set_params = tda826x_set_params,
.get_frequency = tda826x_get_frequency,
......
drivers/media/dvb-frontends/tua6100.c
View file @ f2709c20
......@@ -42,6 +42,12 @@ struct tua6100_priv {
u32 frequency;
};
static void tua6100_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int tua6100_sleep(struct dvb_frontend *fe)
{
struct tua6100_priv *priv = fe->tuner_priv;
......@@ -157,7 +163,7 @@ static const struct dvb_tuner_ops tua6100_tuner_ops = {
.frequency_max = 2150000,
.frequency_step = 1000,
},
.release = dvb_tuner_simple_release,
.release = tua6100_release,
.sleep = tua6100_sleep,
.set_params = tua6100_set_params,
.get_frequency = tua6100_get_frequency,
......
drivers/media/dvb-frontends/zl10036.c
View file @ f2709c20
......@@ -134,6 +134,14 @@ static int zl10036_write(struct zl10036_state *state, u8 buf[], u8 count)
return 0;
}
static void zl10036_release(struct dvb_frontend *fe)
{
struct zl10036_state *state = fe->tuner_priv;
fe->tuner_priv = NULL;
kfree(state);
}
static int zl10036_sleep(struct dvb_frontend *fe)
{
struct zl10036_state *state = fe->tuner_priv;
......@@ -443,7 +451,7 @@ static const struct dvb_tuner_ops zl10036_tuner_ops = {
.frequency_max = 2175000
},
.init = zl10036_init,
.release = dvb_tuner_simple_release,
.release = zl10036_release,
.sleep = zl10036_sleep,
.set_params = zl10036_set_params,
.get_frequency = zl10036_get_frequency,
......
drivers/media/tuners/fc0011.c
View file @ f2709c20
......@@ -112,6 +112,12 @@ static int fc0011_readreg(struct fc0011_priv *priv, u8 reg, u8 *val)
return 0;
}
static void fc0011_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int fc0011_init(struct dvb_frontend *fe)
{
struct fc0011_priv *priv = fe->tuner_priv;
......@@ -475,7 +481,7 @@ static const struct dvb_tuner_ops fc0011_tuner_ops = {
.frequency_max = 1000000000,
},
.release = dvb_tuner_simple_release,
.release = fc0011_release,
.init = fc0011_init,
.set_params = fc0011_set_params,
......
drivers/media/tuners/fc0012.c
View file @ f2709c20
......@@ -55,6 +55,12 @@ static int fc0012_readreg(struct fc0012_priv *priv, u8 reg, u8 *val)
return 0;
}
static void fc0012_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int fc0012_init(struct dvb_frontend *fe)
{
struct fc0012_priv *priv = fe->tuner_priv;
......@@ -420,7 +426,7 @@ static const struct dvb_tuner_ops fc0012_tuner_ops = {
.frequency_step = 0,
},
.release = dvb_tuner_simple_release,
.release = fc0012_release,
.init = fc0012_init,
......
drivers/media/tuners/fc0013.c
View file @ f2709c20
......@@ -52,6 +52,12 @@ static int fc0013_readreg(struct fc0013_priv *priv, u8 reg, u8 *val)
return 0;
}
static void fc0013_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int fc0013_init(struct dvb_frontend *fe)
{
struct fc0013_priv *priv = fe->tuner_priv;
......@@ -579,7 +585,7 @@ static const struct dvb_tuner_ops fc0013_tuner_ops = {
.frequency_step = 0,
},
.release = dvb_tuner_simple_release,
.release = fc0013_release,
.init = fc0013_init,
.sleep = fc0013_sleep,
......
drivers/media/tuners/mc44s803.c
View file @ f2709c20
......@@ -80,6 +80,14 @@ static int mc44s803_readreg(struct mc44s803_priv *priv, u8 reg, u32 *val)
return 0;
}
static void mc44s803_release(struct dvb_frontend *fe)
{
struct mc44s803_priv *priv = fe->tuner_priv;
fe->tuner_priv = NULL;
kfree(priv);
}
static int mc44s803_init(struct dvb_frontend *fe)
{
struct mc44s803_priv *priv = fe->tuner_priv;
......@@ -302,7 +310,7 @@ static const struct dvb_tuner_ops mc44s803_tuner_ops = {
.frequency_step = 100000,
},
.release = dvb_tuner_simple_release,
.release = mc44s803_release,
.init = mc44s803_init,
.set_params = mc44s803_set_params,
.get_frequency = mc44s803_get_frequency,
......
drivers/media/tuners/mt2060.c
View file @ f2709c20
......@@ -332,6 +332,12 @@ static int mt2060_sleep(struct dvb_frontend *fe)
return ret;
}
static void mt2060_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static const struct dvb_tuner_ops mt2060_tuner_ops = {
.info = {
.name = "Microtune MT2060",
......@@ -340,7 +346,7 @@ static const struct dvb_tuner_ops mt2060_tuner_ops = {
.frequency_step = 50000,
},
.release = dvb_tuner_simple_release,
.release = mt2060_release,
.init = mt2060_init,
.sleep = mt2060_sleep,
......
drivers/media/tuners/mt20xx.c
View file @ f2709c20
......@@ -49,6 +49,12 @@ struct microtune_priv {
u32 frequency;
};
static void microtune_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int microtune_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{
struct microtune_priv *priv = fe->tuner_priv;
......@@ -357,7 +363,7 @@ static int mt2032_set_params(struct dvb_frontend *fe,
static const struct dvb_tuner_ops mt2032_tuner_ops = {
.set_analog_params = mt2032_set_params,
.release = dvb_tuner_simple_release,
.release = microtune_release,
.get_frequency = microtune_get_frequency,
};
......@@ -552,7 +558,7 @@ static int mt2050_set_params(struct dvb_frontend *fe,
static const struct dvb_tuner_ops mt2050_tuner_ops = {
.set_analog_params = mt2050_set_params,
.release = dvb_tuner_simple_release,
.release = microtune_release,
.get_frequency = microtune_get_frequency,
};
......
drivers/media/tuners/mt2266.c
View file @ f2709c20
......@@ -296,6 +296,12 @@ static int mt2266_sleep(struct dvb_frontend *fe)
return 0;
}
static void mt2266_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static const struct dvb_tuner_ops mt2266_tuner_ops = {
.info = {
.name = "Microtune MT2266",
......@@ -303,7 +309,7 @@ static const struct dvb_tuner_ops mt2266_tuner_ops = {
.frequency_max = 862000000,
.frequency_step = 50000,
},
.release = dvb_tuner_simple_release,
.release = mt2266_release,
.init = mt2266_init,
.sleep = mt2266_sleep,
.set_params = mt2266_set_params,
......
drivers/media/tuners/qt1010.c
View file @ f2709c20
......@@ -377,6 +377,12 @@ static int qt1010_init(struct dvb_frontend *fe)
return qt1010_set_params(fe);
}
static void qt1010_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int qt1010_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{
struct qt1010_priv *priv = fe->tuner_priv;
......@@ -398,7 +404,7 @@ static const struct dvb_tuner_ops qt1010_tuner_ops = {
.frequency_step = QT1010_STEP,
},
.release = dvb_tuner_simple_release,
.release = qt1010_release,
.init = qt1010_init,
/* TODO: implement sleep */
......
drivers/media/tuners/tda18218.c
View file @ f2709c20
......@@ -265,6 +265,12 @@ static int tda18218_init(struct dvb_frontend *fe)
return ret;
}
static void tda18218_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static const struct dvb_tuner_ops tda18218_tuner_ops = {
.info = {
.name = "NXP TDA18218",
......@@ -274,7 +280,7 @@ static const struct dvb_tuner_ops tda18218_tuner_ops = {
.frequency_step = 1000,
},
.release = dvb_tuner_simple_release,
.release = tda18218_release,
.init = tda18218_init,
.sleep = tda18218_sleep,
......
drivers/media/tuners/tda827x.c
View file @ f2709c20
......@@ -767,6 +767,12 @@ static void tda827xa_agcf(struct dvb_frontend *fe)
/* ------------------------------------------------------------------ */
static void tda827x_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int tda827x_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{
struct tda827x_priv *priv = fe->tuner_priv;
......@@ -818,7 +824,7 @@ static const struct dvb_tuner_ops tda827xo_tuner_ops = {
.frequency_max = 860000000,
.frequency_step = 250000
},
.release = dvb_tuner_simple_release,
.release = tda827x_release,
.init = tda827x_initial_init,
.sleep = tda827x_initial_sleep,
.set_params = tda827xo_set_params,
......@@ -834,7 +840,7 @@ static const struct dvb_tuner_ops tda827xa_tuner_ops = {
.frequency_max = 906000000,
.frequency_step = 62500
},
.release = dvb_tuner_simple_release,
.release = tda827x_release,
.init = tda827x_init,
.sleep = tda827xa_sleep,
.set_params = tda827xa_set_params,
......
drivers/media/tuners/tea5761.c
View file @ f2709c20
......@@ -284,6 +284,12 @@ int tea5761_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr)
return 0;
}
static void tea5761_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int tea5761_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{
struct tea5761_priv *priv = fe->tuner_priv;
......@@ -297,7 +303,7 @@ static const struct dvb_tuner_ops tea5761_tuner_ops = {
},
.set_analog_params = set_radio_freq,
.sleep = set_radio_sleep,
.release = dvb_tuner_simple_release,
.release = tea5761_release,
.get_frequency = tea5761_get_frequency,
.get_status = tea5761_get_status,
.get_rf_strength = tea5761_get_rf_strength,
......
drivers/media/tuners/tea5767.c
View file @ f2709c20
......@@ -401,6 +401,12 @@ int tea5767_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr)
return 0;
}
static void tea5767_release(struct dvb_frontend *fe)
{
kfree(fe->tuner_priv);
fe->tuner_priv = NULL;
}
static int tea5767_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{
struct tea5767_priv *priv = fe->tuner_priv;
......@@ -426,7 +432,7 @@ static const struct dvb_tuner_ops tea5767_tuner_ops = {
.set_analog_params = set_radio_freq,
.set_config = tea5767_set_config,
.sleep = tea5767_standby,
.release = dvb_tuner_simple_release,
.release = tea5767_release,
.get_frequency = tea5767_get_frequency,
.get_status = tea5767_get_status,
.get_rf_strength = tea5767_get_rf_strength,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7