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

Commit 9ab494b0 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Mauro Carvalho Chehab
Browse files

[media] it913x.: Fix a misuse of || 



On Mon, 2012-05-07 at 07:45 -0300, Mauro Carvalho Chehab wrote:
> Malcolm,
>
> Em 04-04-2012 20:00, Joe Perches escreveu:
> > Likely these should be && not ||
> >
> > drivers/scsi/FlashPoint.c:				if(bit_cnt != 0 || bit_cnt != 8)
>
> > drivers/media/dvb/dvb-usb/it913x.c:		if (ret == 0 || ret != -EBUSY || ret != -ETIMEDOUT)
> > drivers/media/dvb/dvb-usb/it913x.c:		if (ret == 0 || ret != -EBUSY || ret != -ETIMEDOUT)
>
> Could you please take a look on the above?

Hmm... yes, thanks, also a bug.

Just check for -EBUSY && -ETIMEDOUT

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0550b294

drivers/media/dvb/dvb-usb/it913x.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ static int it913x_bulk_write(struct usb_device *dev, 
	for (i = 0; i < IT913X_RETRY; i++) {

	for (i = 0; i < IT913X_RETRY; i++) {

		ret = usb_bulk_msg(dev, usb_sndbulkpipe(dev, pipe),

		ret = usb_bulk_msg(dev, usb_sndbulkpipe(dev, pipe),

				snd, len , &actual_l, IT913X_SND_TIMEOUT);

				snd, len , &actual_l, IT913X_SND_TIMEOUT);

		if (ret == 0 || ret != -EBUSY || ret != -ETIMEDOUT)

		if (ret != -EBUSY && ret != -ETIMEDOUT)

			break;

			break;

	}

	}
@@ -99,7 +99,7 @@ static int it913x_bulk_read(struct usb_device *dev, 
	for (i = 0; i < IT913X_RETRY; i++) {

	for (i = 0; i < IT913X_RETRY; i++) {

		ret = usb_bulk_msg(dev, usb_rcvbulkpipe(dev, pipe),

		ret = usb_bulk_msg(dev, usb_rcvbulkpipe(dev, pipe),

				 rev, len , &actual_l, IT913X_RCV_TIMEOUT);

				 rev, len , &actual_l, IT913X_RCV_TIMEOUT);

		if (ret == 0 || ret != -EBUSY || ret != -ETIMEDOUT)

		if (ret != -EBUSY && ret != -ETIMEDOUT)

			break;

			break;

	}

	}