From f420937cd062da021ae9b2c1e3261ba02d060bf6 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Mon, 7 May 2012 11:22:52 -0300 Subject: [PATCH] --- yaml --- r: 306421 b: refs/heads/master c: 9ab494b010e1b4c4693afa297ffbcf0f09bb9063 h: refs/heads/master i: 306419: c9fb287bb3a2f01baf93a7475eb88da4fd82fb9a v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/it913x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ff9f183702dd..191b1b7131fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0550b29464f1d43a690198a6a8e984ae788ba9fa +refs/heads/master: 9ab494b010e1b4c4693afa297ffbcf0f09bb9063 diff --git a/trunk/drivers/media/dvb/dvb-usb/it913x.c b/trunk/drivers/media/dvb/dvb-usb/it913x.c index 482d249ca7f3..6244fe9d1a3a 100644 --- a/trunk/drivers/media/dvb/dvb-usb/it913x.c +++ b/trunk/drivers/media/dvb/dvb-usb/it913x.c @@ -81,7 +81,7 @@ static int it913x_bulk_write(struct usb_device *dev, for (i = 0; i < IT913X_RETRY; i++) { ret = usb_bulk_msg(dev, usb_sndbulkpipe(dev, pipe), snd, len , &actual_l, IT913X_SND_TIMEOUT); - if (ret == 0 || ret != -EBUSY || ret != -ETIMEDOUT) + if (ret != -EBUSY && ret != -ETIMEDOUT) break; } @@ -99,7 +99,7 @@ static int it913x_bulk_read(struct usb_device *dev, for (i = 0; i < IT913X_RETRY; i++) { ret = usb_bulk_msg(dev, usb_rcvbulkpipe(dev, pipe), rev, len , &actual_l, IT913X_RCV_TIMEOUT); - if (ret == 0 || ret != -EBUSY || ret != -ETIMEDOUT) + if (ret != -EBUSY && ret != -ETIMEDOUT) break; }