diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /drivers/media/video/mt9m001.c | |
| parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
| parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) | |
| download | blackbird-op-linux-1240e6b5532358257c52351639a8d2382fe58f84.tar.gz blackbird-op-linux-1240e6b5532358257c52351639a8d2382fe58f84.zip | |
Merge branch 'fix/misc' into topic/misc
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 = { #endif }; -static int mt9m001_enum_fmt(struct v4l2_subdev *sd, int index, +static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { struct i2c_client *client = sd->priv; struct mt9m001 *mt9m001 = to_mt9m001(client); - if ((unsigned int)index >= mt9m001->num_fmts) + if (index >= mt9m001->num_fmts) return -EINVAL; *code = mt9m001->fmts[index].code; @@ -785,7 +785,6 @@ static int mt9m001_probe(struct i2c_client *client, ret = mt9m001_video_probe(icd, client); if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(mt9m001); } @@ -799,7 +798,6 @@ static int mt9m001_remove(struct i2c_client *client) icd->ops = NULL; mt9m001_video_remove(icd); - i2c_set_clientdata(client, NULL); client->driver = NULL; kfree(mt9m001); |
