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

Commit 8c081b6f authored by Douglas Fischer's avatar Douglas Fischer Committed by Mauro Carvalho Chehab
Browse files

media: radio: Critical v4l2 registration bugfix for si470x over i2c 



Added the call to v4l2_device_register() required to add a new radio device.
Without this patch, it is impossible for the driver to load. This does not
affect USB devices.

Signed-off-by: default avatarDouglas Fischer <fischerdouglasc@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 36d6bf89

drivers/media/radio/si470x/radio-si470x-i2c.c

+28 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static const struct i2c_device_id si470x_i2c_id[] = { 
MODULE_DEVICE_TABLE(i2c, si470x_i2c_id);







/**************************************************************************

 * Module Parameters

 **************************************************************************/
@@ -362,22 +361,43 @@ static int si470x_i2c_probe(struct i2c_client *client, 
	mutex_init(&radio->lock);

	init_completion(&radio->completion);



	retval = v4l2_device_register(&client->dev, &radio->v4l2_dev);

	if (retval < 0) {

		dev_err(&client->dev, "couldn't register v4l2_device\n");

		goto err_radio;

	}



	v4l2_ctrl_handler_init(&radio->hdl, 2);

	v4l2_ctrl_new_std(&radio->hdl, &si470x_ctrl_ops,

			V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);

	v4l2_ctrl_new_std(&radio->hdl, &si470x_ctrl_ops,

			V4L2_CID_AUDIO_VOLUME, 0, 15, 1, 15);

	if (radio->hdl.error) {

		retval = radio->hdl.error;

		dev_err(&client->dev, "couldn't register control\n");

		goto err_dev;

	}



	/* video device initialization */

	radio->videodev = si470x_viddev_template;

	radio->videodev.ctrl_handler = &radio->hdl;

	radio->videodev.lock = &radio->lock;

	radio->videodev.v4l2_dev = &radio->v4l2_dev;

	radio->videodev.release = video_device_release_empty;

	video_set_drvdata(&radio->videodev, radio);



	/* power up : need 110ms */

	radio->registers[POWERCFG] = POWERCFG_ENABLE;

	if (si470x_set_register(radio, POWERCFG) < 0) {

		retval = -EIO;

		goto err_radio;

		goto err_ctrl;

	}

	msleep(110);



	/* get device and chip versions */

	if (si470x_get_all_registers(radio) < 0) {

		retval = -EIO;

		goto err_radio;

		goto err_ctrl;

	}

	dev_info(&client->dev, "DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",

			radio->registers[DEVICEID], radio->registers[SI_CHIPID]);
@@ -407,7 +427,7 @@ static int si470x_i2c_probe(struct i2c_client *client, 
	radio->buffer = kmalloc(radio->buf_size, GFP_KERNEL);

	if (!radio->buffer) {

		retval = -EIO;

		goto err_radio;

		goto err_ctrl;

	}



	/* rds buffer configuration */
@@ -437,6 +457,10 @@ static int si470x_i2c_probe(struct i2c_client *client, 
	free_irq(client->irq, radio);

err_rds:

	kfree(radio->buffer);

err_ctrl:

	v4l2_ctrl_handler_free(&radio->hdl);

err_dev:

	v4l2_device_unregister(&radio->v4l2_dev);

err_radio:

	kfree(radio);

err_initial: