blk-mq: ensure that bd->last is always set correctly

[linux.git] / drivers / media / v4l2-core / v4l2-device.c

diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
index 62bbed76dbbc401bda8413ec94cc5cf4d065f5de..f364cc1b521dcd65919cb8a548e3f3d18acf6880 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-device.c
+++ b/drivers/media/v4l2-core/v4l2-device.c
@@ -253,6 +253,7 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
                        kfree(vdev);
                        goto clean_up;
                }
+               sd->devnode = vdev;
 #if defined(CONFIG_MEDIA_CONTROLLER)
                sd->entity.info.dev.major = VIDEO_MAJOR;
                sd->entity.info.dev.minor = vdev->minor;
@@ -270,7 +271,6 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
                        }
                }
 #endif
-               sd->devnode = vdev;
        }
        return 0;