Commit 14d5deba authored by Richard Knutsson's avatar Richard Knutsson Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6776): ivtv: Some general fixes 



Fix "warning: Using plain integer as NULL pointer".
Convert 'x < y ? x : y' to use min() instead.

Signed-off-by: default avatarRichard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent d130fa8a

drivers/media/video/ivtv/ivtv-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
	}



	itv = kzalloc(sizeof(struct ivtv), GFP_ATOMIC);

	if (itv == 0) {

	if (itv == NULL) {

		spin_unlock(&ivtv_cards_lock);

		return -ENOMEM;

	}

drivers/media/video/ivtv/ivtv-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ static int ivtv_debug_ioctls(struct file *filp, unsigned int cmd, void *arg) 
			ivtv_reset_ir_gpio(itv);

		}

		if (val & 0x02) {

			itv->video_dec_func(itv, cmd, 0);

			itv->video_dec_func(itv, cmd, NULL);

		}

		break;

	}

drivers/media/video/ivtv/ivtv-irq.c

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int stream_enc_dma_append(struct ivtv_stream *s, u32 data[CX2341X_MBOX_MA 
		s->sg_pending[idx].dst = buf->dma_handle;

		s->sg_pending[idx].src = offset;

		s->sg_pending[idx].size = s->buf_size;

		buf->bytesused = (size < s->buf_size) ? size : s->buf_size;

		buf->bytesused = min(size, s->buf_size);

		buf->dma_xfer_cnt = s->dma_xfer_cnt;



		s->q_predma.bytesused += buf->bytesused;
@@ -736,7 +736,7 @@ static void ivtv_irq_dec_data_req(struct ivtv *itv) 
		s = &itv->streams[IVTV_DEC_STREAM_TYPE_YUV];

	}

	else {

		itv->dma_data_req_size = data[2] >= 0x10000 ? 0x10000 : data[2];

		itv->dma_data_req_size = min_t(u32, data[2], 0x10000);

		itv->dma_data_req_offset = data[1];

		s = &itv->streams[IVTV_DEC_STREAM_TYPE_MPG];

	}

drivers/media/video/ivtv/ivtv-streams.c

+2 −2
Original line number Diff line number Diff line
@@ -572,10 +572,10 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s) 
		clear_bit(IVTV_F_I_EOS, &itv->i_flags);



		/* Initialize Digitizer for Capture */

		itv->video_dec_func(itv, VIDIOC_STREAMOFF, 0);

		itv->video_dec_func(itv, VIDIOC_STREAMOFF, NULL);

		ivtv_msleep_timeout(300, 1);

		ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0);

		itv->video_dec_func(itv, VIDIOC_STREAMON, 0);

		itv->video_dec_func(itv, VIDIOC_STREAMON, NULL);

	}



	/* begin_capture */

drivers/media/video/ivtv/ivtvfb.c

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ static int ivtvfb_init_card(struct ivtv *itv) 
	}



	itv->osd_info = kzalloc(sizeof(struct osd_info), GFP_ATOMIC);

	if (itv->osd_info == 0) {

	if (itv->osd_info == NULL) {

		IVTVFB_ERR("Failed to allocate memory for osd_info\n");

		return -ENOMEM;

	}