diff options
Diffstat (limited to 'drivers/media/video/mt9m001.c')
-rw-r--r-- | drivers/media/video/mt9m001.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c index b62c0bd3f8ea..79f096ddcf5d 100644 --- a/drivers/media/video/mt9m001.c +++ b/drivers/media/video/mt9m001.c | |||
@@ -701,13 +701,13 @@ static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = { | |||
701 | #endif | 701 | #endif |
702 | }; | 702 | }; |
703 | 703 | ||
704 | static int mt9m001_enum_fmt(struct v4l2_subdev *sd, int index, | 704 | static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index, |
705 | enum v4l2_mbus_pixelcode *code) | 705 | enum v4l2_mbus_pixelcode *code) |
706 | { | 706 | { |
707 | struct i2c_client *client = sd->priv; | 707 | struct i2c_client *client = sd->priv; |
708 | struct mt9m001 *mt9m001 = to_mt9m001(client); | 708 | struct mt9m001 *mt9m001 = to_mt9m001(client); |
709 | 709 | ||
710 | if ((unsigned int)index >= mt9m001->num_fmts) | 710 | if (index >= mt9m001->num_fmts) |
711 | return -EINVAL; | 711 | return -EINVAL; |
712 | 712 | ||
713 | *code = mt9m001->fmts[index].code; | 713 | *code = mt9m001->fmts[index].code; |
@@ -785,7 +785,6 @@ static int mt9m001_probe(struct i2c_client *client, | |||
785 | ret = mt9m001_video_probe(icd, client); | 785 | ret = mt9m001_video_probe(icd, client); |
786 | if (ret) { | 786 | if (ret) { |
787 | icd->ops = NULL; | 787 | icd->ops = NULL; |
788 | i2c_set_clientdata(client, NULL); | ||
789 | kfree(mt9m001); | 788 | kfree(mt9m001); |
790 | } | 789 | } |
791 | 790 | ||
@@ -799,7 +798,6 @@ static int mt9m001_remove(struct i2c_client *client) | |||
799 | 798 | ||
800 | icd->ops = NULL; | 799 | icd->ops = NULL; |
801 | mt9m001_video_remove(icd); | 800 | mt9m001_video_remove(icd); |
802 | i2c_set_clientdata(client, NULL); | ||
803 | client->driver = NULL; | 801 | client->driver = NULL; |
804 | kfree(mt9m001); | 802 | kfree(mt9m001); |
805 | 803 | ||