Skip to content

Commit

Permalink
V4L/DVB (13063): radio-mr800: remove unnecessary local variable
Browse files Browse the repository at this point in the history
Remove unnecessary local variable.

Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
Acked-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
David Ellingsworth authored and Mauro Carvalho Chehab committed Dec 5, 2009
1 parent 1b8bbb3 commit d1939e4
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/media/radio/radio-mr800.c
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,6 @@ static int usb_amradio_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct amradio_device *radio;
struct v4l2_device *v4l2_dev;
int retval = 0;

radio = kzalloc(sizeof(struct amradio_device), GFP_KERNEL);
Expand All @@ -707,16 +706,15 @@ static int usb_amradio_probe(struct usb_interface *intf,
goto err_nobuf;
}

v4l2_dev = &radio->v4l2_dev;
retval = v4l2_device_register(&intf->dev, v4l2_dev);
retval = v4l2_device_register(&intf->dev, &radio->v4l2_dev);
if (retval < 0) {
dev_err(&intf->dev, "couldn't register v4l2_device\n");
goto err_v4l2;
}

strlcpy(radio->videodev.name, v4l2_dev->name,
strlcpy(radio->videodev.name, radio->v4l2_dev.name,
sizeof(radio->videodev.name));
radio->videodev.v4l2_dev = v4l2_dev;
radio->videodev.v4l2_dev = &radio->v4l2_dev;
radio->videodev.fops = &usb_amradio_fops;
radio->videodev.ioctl_ops = &usb_amradio_ioctl_ops;
radio->videodev.release = usb_amradio_video_device_release;
Expand All @@ -742,7 +740,7 @@ static int usb_amradio_probe(struct usb_interface *intf,
return 0;

err_vdev:
v4l2_device_unregister(v4l2_dev);
v4l2_device_unregister(&radio->v4l2_dev);
err_v4l2:
kfree(radio->buffer);
err_nobuf:
Expand Down

0 comments on commit d1939e4

Please sign in to comment.