Commit 9058fc92 authored by Amarjargal Gundjalam's avatar Amarjargal Gundjalam Committed by Greg Kroah-Hartman
Browse files

staging: media: omap4iss: Fixes NULL comparison 



This patch fixes the checkpatch issue:

CHECK: Comparison to NULL could be written

Signed-off-by: default avatarAmarjargal Gundjalam <amarjargal.gundjalam@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a09ad8c7

drivers/staging/media/omap4iss/iss.c

+14 −14
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int omap4iss_get_external_info(struct iss_pipeline *pipe, 


	ctrl = v4l2_ctrl_find(pipe->external->ctrl_handler,

			      V4L2_CID_PIXEL_RATE);

	if (ctrl == NULL) {

	if (!ctrl) {

		dev_warn(iss->dev, "no pixel rate control in subdev %s\n",

			 pipe->external->name);

		return -EPIPE;
@@ -422,7 +422,7 @@ static int iss_pipeline_pm_power_one(struct media_entity *entity, int change) 
	subdev = media_entity_type(entity) == MEDIA_ENT_T_V4L2_SUBDEV

	       ? media_entity_to_v4l2_subdev(entity) : NULL;



	if (entity->use_count == 0 && change > 0 && subdev != NULL) {

	if (entity->use_count == 0 && change > 0 && subdev) {

		int ret;



		ret = v4l2_subdev_call(subdev, core, s_power, 1);
@@ -433,7 +433,7 @@ static int iss_pipeline_pm_power_one(struct media_entity *entity, int change) 
	entity->use_count += change;

	WARN_ON(entity->use_count < 0);



	if (entity->use_count == 0 && change < 0 && subdev != NULL)

	if (entity->use_count == 0 && change < 0 && subdev)

		v4l2_subdev_call(subdev, core, s_power, 0);



	return 0;
@@ -590,7 +590,7 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe, 
			break;



		pad = media_entity_remote_pad(pad);

		if (pad == NULL ||

		if (!pad ||

		    media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)

			break;
@@ -658,7 +658,7 @@ static int iss_pipeline_enable(struct iss_pipeline *pipe, 
			break;



		pad = media_entity_remote_pad(pad);

		if (pad == NULL ||

		if (!pad ||

		    media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)

			break;
@@ -1050,7 +1050,7 @@ struct iss_device *omap4iss_get(struct iss_device *iss) 
{

	struct iss_device *__iss = iss;



	if (iss == NULL)

	if (!iss)

		return NULL;



	mutex_lock(&iss->iss_mutex);
@@ -1065,7 +1065,7 @@ struct iss_device *omap4iss_get(struct iss_device *iss) 
	iss_enable_interrupts(iss);



out:

	if (__iss != NULL)

	if (__iss)

		iss->ref_count++;

	mutex_unlock(&iss->iss_mutex);
@@ -1080,7 +1080,7 @@ struct iss_device *omap4iss_get(struct iss_device *iss) 
 */

void omap4iss_put(struct iss_device *iss)

{

	if (iss == NULL)

	if (!iss)

		return;



	mutex_lock(&iss->iss_mutex);
@@ -1142,7 +1142,7 @@ iss_register_subdev_group(struct iss_device *iss, 
	struct v4l2_subdev *sensor = NULL;

	unsigned int first;



	if (board_info->board_info == NULL)

	if (!board_info->board_info)

		return NULL;



	for (first = 1; board_info->board_info; ++board_info, first = 0) {
@@ -1150,7 +1150,7 @@ iss_register_subdev_group(struct iss_device *iss, 
		struct i2c_adapter *adapter;



		adapter = i2c_get_adapter(board_info->i2c_adapter_id);

		if (adapter == NULL) {

		if (!adapter) {

			dev_err(iss->dev,

				"%s: Unable to get I2C adapter %d for device %s\n",

				__func__, board_info->i2c_adapter_id,
@@ -1160,7 +1160,7 @@ iss_register_subdev_group(struct iss_device *iss, 


		subdev = v4l2_i2c_new_subdev_board(&iss->v4l2_dev, adapter,

				board_info->board_info, NULL);

		if (subdev == NULL) {

		if (!subdev) {

			dev_err(iss->dev, "Unable to register subdev %s\n",

				board_info->board_info->type);

			continue;
@@ -1228,7 +1228,7 @@ static int iss_register_entities(struct iss_device *iss) 
		unsigned int pad;



		sensor = iss_register_subdev_group(iss, subdevs->subdevs);

		if (sensor == NULL)

		if (!sensor)

			continue;



		sensor->host_priv = subdevs;
@@ -1369,7 +1369,7 @@ static int iss_probe(struct platform_device *pdev) 
	unsigned int i;

	int ret;



	if (pdata == NULL)

	if (!pdata)

		return -EINVAL;



	iss = devm_kzalloc(&pdev->dev, sizeof(*iss), GFP_KERNEL);
@@ -1406,7 +1406,7 @@ static int iss_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto error;



	if (omap4iss_get(iss) == NULL)

	if (!omap4iss_get(iss))

		goto error;



	ret = iss_reset(iss);

drivers/staging/media/omap4iss/iss_csi2.c

+3 −3
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ static void csi2_isr_buffer(struct iss_csi2_device *csi2) 
	 * Let video queue operation restart engine if there is an underrun

	 * condition.

	 */

	if (buffer == NULL)

	if (!buffer)

		return;



	csi2_set_outaddr(csi2, buffer->iss_addr);
@@ -979,7 +979,7 @@ static int csi2_get_format(struct v4l2_subdev *sd, 
	struct v4l2_mbus_framefmt *format;



	format = __csi2_get_format(csi2, cfg, fmt->pad, fmt->which);

	if (format == NULL)

	if (!format)

		return -EINVAL;



	fmt->format = *format;
@@ -1001,7 +1001,7 @@ static int csi2_set_format(struct v4l2_subdev *sd, 
	struct v4l2_mbus_framefmt *format;



	format = __csi2_get_format(csi2, cfg, fmt->pad, fmt->which);

	if (format == NULL)

	if (!format)

		return -EINVAL;



	csi2_try_format(csi2, cfg, fmt->pad, &fmt->format, fmt->which);

drivers/staging/media/omap4iss/iss_ipipe.c

+2 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int ipipe_get_format(struct v4l2_subdev *sd, 
	struct v4l2_mbus_framefmt *format;



	format = __ipipe_get_format(ipipe, cfg, fmt->pad, fmt->which);

	if (format == NULL)

	if (!format)

		return -EINVAL;



	fmt->format = *format;
@@ -344,7 +344,7 @@ static int ipipe_set_format(struct v4l2_subdev *sd, 
	struct v4l2_mbus_framefmt *format;



	format = __ipipe_get_format(ipipe, cfg, fmt->pad, fmt->which);

	if (format == NULL)

	if (!format)

		return -EINVAL;



	ipipe_try_format(ipipe, cfg, fmt->pad, &fmt->format, fmt->which);

drivers/staging/media/omap4iss/iss_ipipeif.c

+3 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void ipipeif_isr_buffer(struct iss_ipipeif_device *ipipeif) 
	ipipeif_write_enable(ipipeif, 0);



	buffer = omap4iss_video_buffer_next(&ipipeif->video_out);

	if (buffer == NULL)

	if (!buffer)

		return;



	ipipeif_set_outaddr(ipipeif, buffer->iss_addr);
@@ -526,7 +526,7 @@ static int ipipeif_get_format(struct v4l2_subdev *sd, 
	struct v4l2_mbus_framefmt *format;



	format = __ipipeif_get_format(ipipeif, cfg, fmt->pad, fmt->which);

	if (format == NULL)

	if (!format)

		return -EINVAL;



	fmt->format = *format;
@@ -550,7 +550,7 @@ static int ipipeif_set_format(struct v4l2_subdev *sd, 
	struct v4l2_mbus_framefmt *format;



	format = __ipipeif_get_format(ipipeif, cfg, fmt->pad, fmt->which);

	if (format == NULL)

	if (!format)

		return -EINVAL;



	ipipeif_try_format(ipipeif, cfg, fmt->pad, &fmt->format, fmt->which);

drivers/staging/media/omap4iss/iss_resizer.c

+3 −3
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static void resizer_isr_buffer(struct iss_resizer_device *resizer) 
	resizer_enable(resizer, 0);



	buffer = omap4iss_video_buffer_next(&resizer->video_out);

	if (buffer == NULL)

	if (!buffer)

		return;



	resizer_set_outaddr(resizer, buffer->iss_addr);
@@ -588,7 +588,7 @@ static int resizer_get_format(struct v4l2_subdev *sd, 
	struct v4l2_mbus_framefmt *format;



	format = __resizer_get_format(resizer, cfg, fmt->pad, fmt->which);

	if (format == NULL)

	if (!format)

		return -EINVAL;



	fmt->format = *format;
@@ -612,7 +612,7 @@ static int resizer_set_format(struct v4l2_subdev *sd, 
	struct v4l2_mbus_framefmt *format;



	format = __resizer_get_format(resizer, cfg, fmt->pad, fmt->which);

	if (format == NULL)

	if (!format)

		return -EINVAL;



	resizer_try_format(resizer, cfg, fmt->pad, &fmt->format, fmt->which);