hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Douglas Fischer <fischerdouglasc@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Douglas Fischer 2018-02-26 18:22:02 -05:00 committed by Mauro Carvalho Chehab
parent 36d6bf8976
commit 8c081b6f9a
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/media/radio/si470x/radio-si470x-i2c.c
View File

@ -43,7 +43,6 @@ static const struct i2c_device_id si470x_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, si470x_i2c_id); MODULE_DEVICE_TABLE(i2c, si470x_i2c_id);
/************************************************************************** /**************************************************************************
* Module Parameters * Module Parameters
**************************************************************************/ **************************************************************************/
@ -362,22 +361,43 @@ static int si470x_i2c_probe(struct i2c_client *client,
mutex_init(&radio->lock); mutex_init(&radio->lock);
init_completion(&radio->completion); 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 */ /* video device initialization */
radio->videodev = si470x_viddev_template; 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); video_set_drvdata(&radio->videodev, radio);
/* power up : need 110ms */ /* power up : need 110ms */
radio->registers[POWERCFG] = POWERCFG_ENABLE; radio->registers[POWERCFG] = POWERCFG_ENABLE;
if (si470x_set_register(radio, POWERCFG) < 0) { if (si470x_set_register(radio, POWERCFG) < 0) {
retval = -EIO; retval = -EIO;
goto err_radio; goto err_ctrl;
} }
msleep(110); msleep(110);
/* get device and chip versions */ /* get device and chip versions */
if (si470x_get_all_registers(radio) < 0) { if (si470x_get_all_registers(radio) < 0) {
retval = -EIO; retval = -EIO;
goto err_radio; goto err_ctrl;
} }
dev_info(&client->dev, "DeviceID=0x%4.4hx ChipID=0x%4.4hx\n", dev_info(&client->dev, "DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",
radio->registers[DEVICEID], radio->registers[SI_CHIPID]); 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); radio->buffer = kmalloc(radio->buf_size, GFP_KERNEL);
if (!radio->buffer) { if (!radio->buffer) {
retval = -EIO; retval = -EIO;
goto err_radio; goto err_ctrl;
} }
/* rds buffer configuration */ /* rds buffer configuration */
@ -437,6 +457,10 @@ err_all:
free_irq(client->irq, radio); free_irq(client->irq, radio);
err_rds: err_rds:
kfree(radio->buffer); kfree(radio->buffer);
err_ctrl:
v4l2_ctrl_handler_free(&radio->hdl);
err_dev:
v4l2_device_unregister(&radio->v4l2_dev);
err_radio: err_radio:
kfree(radio); kfree(radio);
err_initial: err_initial: