| Message ID | 1350128479-9619-1-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
Hi Sachin, On 10/13/2012 01:41 PM, Sachin Kamat wrote: > 'fimc' was being dereferenced before the NULL check. > Moved it to after the check. > > Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org> > --- > drivers/media/platform/s5p-fimc/fimc-mdevice.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c > index 80ada58..61fab00 100644 > --- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c > +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c > @@ -343,7 +343,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd) > static int fimc_register_callback(struct device *dev, void *p) > { > struct fimc_dev *fimc = dev_get_drvdata(dev); > - struct v4l2_subdev *sd =&fimc->vid_cap.subdev; > + struct v4l2_subdev *sd; > struct fimc_md *fmd = p; > int ret = 0; > > @@ -353,6 +353,7 @@ static int fimc_register_callback(struct device *dev, void *p) > if (fimc->pdev->id< 0 || fimc->pdev->id>= FIMC_MAX_DEVS) > return 0; > > + sd =&fimc->vid_cap.subdev; > fimc->pipeline_ops =&fimc_pipeline_ops; > fmd->fimc[fimc->pdev->id] = fimc; > sd->grp_id = FIMC_GROUP_ID; > @@ -369,7 +370,7 @@ static int fimc_register_callback(struct device *dev, void *p) > static int fimc_lite_register_callback(struct device *dev, void *p) > { > struct fimc_lite *fimc = dev_get_drvdata(dev); > - struct v4l2_subdev *sd =&fimc->subdev; > + struct v4l2_subdev *sd; Thank you for the patch. May I ask you to remove sd instead and to replace sd with fimc->subdev ? There are just two references of sd below. > struct fimc_md *fmd = p; > int ret; > > @@ -379,6 +380,7 @@ static int fimc_lite_register_callback(struct device *dev, void *p) > if (fimc->index>= FIMC_LITE_MAX_DEVS) > return 0; > > + sd =&fimc->subdev; > fimc->pipeline_ops =&fimc_pipeline_ops; > fmd->fimc_lite[fimc->index] = fimc; > sd->grp_id = FLITE_GROUP_ID; Thanks, Sylwester
diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c index 80ada58..61fab00 100644 --- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c @@ -343,7 +343,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd) static int fimc_register_callback(struct device *dev, void *p) { struct fimc_dev *fimc = dev_get_drvdata(dev); - struct v4l2_subdev *sd = &fimc->vid_cap.subdev; + struct v4l2_subdev *sd; struct fimc_md *fmd = p; int ret = 0; @@ -353,6 +353,7 @@ static int fimc_register_callback(struct device *dev, void *p) if (fimc->pdev->id < 0 || fimc->pdev->id >= FIMC_MAX_DEVS) return 0; + sd = &fimc->vid_cap.subdev; fimc->pipeline_ops = &fimc_pipeline_ops; fmd->fimc[fimc->pdev->id] = fimc; sd->grp_id = FIMC_GROUP_ID; @@ -369,7 +370,7 @@ static int fimc_register_callback(struct device *dev, void *p) static int fimc_lite_register_callback(struct device *dev, void *p) { struct fimc_lite *fimc = dev_get_drvdata(dev); - struct v4l2_subdev *sd = &fimc->subdev; + struct v4l2_subdev *sd; struct fimc_md *fmd = p; int ret; @@ -379,6 +380,7 @@ static int fimc_lite_register_callback(struct device *dev, void *p) if (fimc->index >= FIMC_LITE_MAX_DEVS) return 0; + sd = &fimc->subdev; fimc->pipeline_ops = &fimc_pipeline_ops; fmd->fimc_lite[fimc->index] = fimc; sd->grp_id = FLITE_GROUP_ID;
'fimc' was being dereferenced before the NULL check. Moved it to after the check. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- drivers/media/platform/s5p-fimc/fimc-mdevice.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)