From 07811ff53e27ea7c91b6fb45b0b0f1a70a261bd5 Mon Sep 17 00:00:00 2001
From: David Ellingsworth <david@identd.dyndns.org>
Date: Tue, 22 Sep 2009 21:48:43 -0300
Subject: [PATCH] --- yaml --- r: 173887 b: refs/heads/master c:
 d1939e4c5f053e34dd432b448e221f55586a68ec h: refs/heads/master i:   173885:
 b392ea17ee84a739fd55e382577e1471c0bf01fd   173883:
 92325e58b49c3e1705923d619d2fcbccab452a71   173879:
 b89d07b150680514df63797b2f7e1ca0a858ea39   173871:
 e7420bbc9c27147a76527d1dfa73ec8a515b9f34   173855:
 fd0b4c86320e1de38fe76c861e219f123467c533   173823:
 1b9ddb2b692d0cfef0d631f8954afba3b17301eb v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/radio/radio-mr800.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index bdcb1c5ffebf..78dfadfab342 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b8bbb3c0a719f3baac22ea4a7eb1d636383ba3b
+refs/heads/master: d1939e4c5f053e34dd432b448e221f55586a68ec
diff --git a/trunk/drivers/media/radio/radio-mr800.c b/trunk/drivers/media/radio/radio-mr800.c
index 0c5d734b00fa..24c55a5a6cac 100644
--- a/trunk/drivers/media/radio/radio-mr800.c
+++ b/trunk/drivers/media/radio/radio-mr800.c
@@ -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);
@@ -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;
@@ -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: