Commit fab9bfbe authored May 03, 2010 by Michael Krufky Committed by Mauro Carvalho Chehab Aug 02, 2010

V4L/DVB: tda18271: fix error detection during initialization of first instance



Fix error detection of failures during initialization of first instance:
Dont pass a function into the tda_fail macro. Instead, save the function
return value and pass that into the tda_fail macro.

This prevents the function from being called twice in cases of failure,
for example:

[19026.074070] tuner 4-0060: chip found @ 0xc0 (device #0)
[19026.087755] tda18271 4-0060: creating new instance
[19026.089965] Unknown device detected @ 4-0060, device not supported.
[19026.092233] Unknown device detected @ 4-0060, device not supported.
[19026.092241] tda18271_attach: [4-0060|M] error -22 on line 1275
[19026.092327] tda18271 4-0060: destroying instance

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 4359e5b5

drivers/media/common/tuners/tda18271-fe.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -1249,7 +1249,7 @@ struct dvb_frontend tda18271_attach(struct dvb_frontend fe, u8 addr,
		struct tda18271_config *cfg)
		{
		struct tda18271_priv *priv = NULL;
		int instance;
		int instance, ret;

		mutex_lock(&tda18271_list_mutex);

		@@ -1268,10 +1268,12 @@ struct dvb_frontend tda18271_attach(struct dvb_frontend fe, u8 addr,
		priv->cal_initialized = false;
		mutex_init(&priv->lock);

		if (tda_fail(tda18271_get_id(fe)))
		ret = tda18271_get_id(fe);
		if (tda_fail(ret))
		goto fail;

		if (tda_fail(tda18271_assign_map_layout(fe)))
		ret = tda18271_assign_map_layout(fe);
		if (tda_fail(ret))
		goto fail;

		mutex_lock(&priv->lock);