1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
index b7cfeab0948..cf93de98806 100644
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@ -754,7 +754,7 @@ static int ov6650_g_fmt(struct v4l2_subdev *sd,
 
 static bool is_unscaled_ok(int width, int height, struct v4l2_rect *rect)
 {
-        return (width > rect->width >> 1 || height > rect->height >> 1);
+        return width > rect->width >> 1 || height > rect->height >> 1;
 }
 
 static u8 to_clkrc(struct v4l2_fract *timeperframe,
@@ -840,8 +840,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                 coma_mask |= COMA_BW | COMA_BYTE_SWAP | COMA_WORD_SWAP;
                 coma_set |= COMA_RAW_RGB | COMA_RGB;
                 break;
-        case 0:
-                break;
         default:
                 dev_err(&client->dev, "Pixel format not handled: 0x%x\n", code);
                 return -EINVAL;
@@ -1176,7 +1174,6 @@ static int ov6650_probe(struct i2c_client *client,
 
         if (ret) {
                 icd->ops = NULL;
-                i2c_set_clientdata(client, NULL);
                 kfree(priv);
         }
 
@@ -1187,7 +1184,6 @@ static int ov6650_remove(struct i2c_client *client)
 {
         struct ov6650 *priv = to_ov6650(client);
 
-        i2c_set_clientdata(client, NULL);
         kfree(priv);
         return 0;
 }