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

Commit 3b4a9714 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7922): tuner-simple: fix tuner_warn() induced kernel oops in simple_tuner_attach() 



The tuner_warn() macro relies on the local variable "priv" to be a valid
pointer.  There was a case in simple_tuner_attach() where this cannot be the
case yet, so tuner_warn() would dereference a NULL "priv" pointer.  Changed
the tuner_warn() to a printk() with the originally intended output format.

Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 5cf3f5cd

drivers/media/common/tuners/tuner-simple.c

+4 −2
Original line number Diff line number Diff line
@@ -1018,7 +1018,9 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe, 
			fe->ops.i2c_gate_ctrl(fe, 1);



		if (1 != i2c_transfer(i2c_adap, &msg, 1))

			tuner_warn("unable to probe %s, proceeding anyway.",

			printk(KERN_WARNING "tuner-simple %d-%04x: "

			       "unable to probe %s, proceeding anyway.",

			       i2c_adapter_id(i2c_adap), i2c_addr,

			       tuners[type].name);



		if (fe->ops.i2c_gate_ctrl)