Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d98562d1 authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: dv1394, video1394: remove unnecessary expressions 



init->channel and v.buffer are unsigned and tests for < 0 therefore
always false.  gcc knows this and eliminates the code, but anyway...
Reported by Roel Kluin.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent f22e52b8

drivers/ieee1394/dv1394.c

+1 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) 
		/* default SYT offset is 3 cycles */

		init->syt_offset = 3;



	if ( (init->channel > 63) || (init->channel < 0) )

	if (init->channel > 63)

		init->channel = 63;



	chan_mask = (u64)1 << init->channel;

drivers/ieee1394/video1394.c

+4 −4
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ static long video1394_ioctl(struct file *file, 
		if (unlikely(d == NULL))

			return -EFAULT;



		if (unlikely((v.buffer<0) || (v.buffer>=d->num_desc - 1))) {

		if (unlikely(v.buffer >= d->num_desc - 1)) {

			PRINT(KERN_ERR, ohci->host->id,

			      "Buffer %d out of range",v.buffer);

			return -EINVAL;
@@ -959,7 +959,7 @@ static long video1394_ioctl(struct file *file, 
		if (unlikely(d == NULL))

			return -EFAULT;



		if (unlikely((v.buffer<0) || (v.buffer>d->num_desc - 1))) {

		if (unlikely(v.buffer > d->num_desc - 1)) {

			PRINT(KERN_ERR, ohci->host->id,

			      "Buffer %d out of range",v.buffer);

			return -EINVAL;
@@ -1030,7 +1030,7 @@ static long video1394_ioctl(struct file *file, 
		d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, v.channel);

		if (d == NULL) return -EFAULT;



		if ((v.buffer<0) || (v.buffer>=d->num_desc - 1)) {

		if (v.buffer >= d->num_desc - 1) {

			PRINT(KERN_ERR, ohci->host->id,

			      "Buffer %d out of range",v.buffer);

			return -EINVAL;
@@ -1137,7 +1137,7 @@ static long video1394_ioctl(struct file *file, 
		d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, v.channel);

		if (d == NULL) return -EFAULT;



		if ((v.buffer<0) || (v.buffer>=d->num_desc-1)) {

		if (v.buffer >= d->num_desc - 1) {

			PRINT(KERN_ERR, ohci->host->id,

			      "Buffer %d out of range",v.buffer);

			return -EINVAL;