Merge remote-tracking branch 'sound-asoc/for-next'

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

diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 5b808500e7e79166c4c2868a8c37d737209eb263..57cfe26a393f613361442b6435195b8726f3bb4a 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -291,7 +291,7 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
 error:
        /* If we have a client but no subdev, then something went wrong and
           we must unregister the client. */
-       if (spi && sd == NULL)
+       if (!sd)
                spi_unregister_device(spi);
 
        return sd;