Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c05b6d authored by Andrew de Quincey's avatar Andrew de Quincey Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4311): Fix possible dvb-pll oops 



Supplying a NULL i2c adapter to dvb_pll_attach is allowed, for example with
mt352 demods. However, the pll i2c probe will segfault because it does not
check for this.

Signed-off-by: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e61b6fc5

drivers/media/dvb/frontends/dvb-pll.c

+10 −8
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2 
	struct dvb_pll_priv *priv = NULL;

	int ret;



	if (i2c != NULL) {

		if (fe->ops.i2c_gate_ctrl)

			fe->ops.i2c_gate_ctrl(fe, 1);
@@ -627,6 +628,7 @@ int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2 
			return -1;

		if (fe->ops.i2c_gate_ctrl)

			     fe->ops.i2c_gate_ctrl(fe, 0);

	}



	priv = kzalloc(sizeof(struct dvb_pll_priv), GFP_KERNEL);

	if (priv == NULL)