diff --git a/[refs] b/[refs]
index f4c2528a7280..46acf23fba17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c170ecf434bceb0e188b14a6deb3bfa3ec9ef699
+refs/heads/master: 9d95af9d09d537d287eea9914c0d1ca4cfa0ec7f
diff --git a/trunk/drivers/media/video/v4l2-dev.c b/trunk/drivers/media/video/v4l2-dev.c
index 1ec0a1a8fb73..99f7ee4bc503 100644
--- a/trunk/drivers/media/video/v4l2-dev.c
+++ b/trunk/drivers/media/video/v4l2-dev.c
@@ -226,6 +226,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 	int end;
 	int ret;
 	char *name_base;
+	void *priv = video_get_drvdata(vfd);
 
 	/* the release callback MUST be present */
 	BUG_ON(!vfd->release);
@@ -295,6 +296,9 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 
 	/* sysfs class */
 	memset(&vfd->dev, 0, sizeof(vfd->dev));
+	/* The memset above cleared the device's drvdata, so
+	   put back the copy we made earlier. */
+	video_set_drvdata(vfd, priv);
 	vfd->dev.class = &video_class;
 	vfd->dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
 	if (vfd->parent)