Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / media / platform / s3c-camif / camif-core.c

diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c
index e7163ca..2d5bd3a 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-core.c
+++ b/drivers/media/platform/s3c-camif/camif-core.c
@@ -256,8 +256,7 @@ static void camif_unregister_sensor(struct camif_dev *camif)
        v4l2_device_unregister_subdev(sd);
        camif->sensor.sd = NULL;
        i2c_unregister_device(client);
-       if (adapter)
-               i2c_put_adapter(adapter);
+       i2c_put_adapter(adapter);
 }
 
 static int camif_create_media_links(struct camif_dev *camif)