From patchwork Sat Mar 26 23:29:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 666221 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2QNTnwp000381 for ; Sat, 26 Mar 2011 23:29:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751619Ab1CZX3h (ORCPT ); Sat, 26 Mar 2011 19:29:37 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:51655 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751588Ab1CZX3g (ORCPT ); Sat, 26 Mar 2011 19:29:36 -0400 Received: by wya21 with SMTP id 21so1976599wya.19 for ; Sat, 26 Mar 2011 16:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=bW5nm3gQtJ/p4epVbq1RdGSLFDMsSCz++qSrKxqkR/w=; b=U97soAjA6GzeryomZuwtwLDxy8lqbZKnz68RWKlDcgDJ/WX9o6wI0ogRB8n75uFCvY DkyEpB8wqlEpi0CpofwgCey0AxYV8c4/ZvJhnFvzgg1WvPWMBKYWSIrkyob5oePIXfUb uY+f1STBXkAYrvuhy8DQunO9uqUDaNyMPXKRY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=BXLZ1XCKsrCBRTt0JooImG2UOHhRE080FCS0qd6AW2LwH/4tpziNribPtCgq/vDrsr aRSMQcmOMGfES9RR5z9+SbgzBQVIp+xDp7SL4JM+NSwbZxrLK92WbZytBiH/GMOVGt72 89W+w2NbOqIBar8v1e96BeZEt4x6kVaIJJkA0= Received: by 10.227.180.77 with SMTP id bt13mr1999461wbb.93.1301182175652; Sat, 26 Mar 2011 16:29:35 -0700 (PDT) Received: from [10.64.64.65] (92.41.251.198.threembb.co.uk [92.41.251.198]) by mx.google.com with ESMTPS id g7sm1197889wby.31.2011.03.26.16.29.33 (version=SSLv3 cipher=OTHER); Sat, 26 Mar 2011 16:29:34 -0700 (PDT) Subject: [PATCH] v1.82 DM04/QQBOX dvb-usb-lmedm04 diseqc timing changes From: Malcolm Priestley To: linux-media@vger.kernel.org Date: Sat, 26 Mar 2011 23:29:28 +0000 Message-ID: <1301182168.7060.5.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 26 Mar 2011 23:29:57 +0000 (UTC) diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c index ec0f5a7..91f239c 100644 --- a/drivers/media/dvb/dvb-usb/lmedm04.c +++ b/drivers/media/dvb/dvb-usb/lmedm04.c @@ -179,8 +179,6 @@ static int lme2510_usb_talk(struct dvb_usb_device *d, ret |= lme2510_bulk_write(d->udev, buff, wlen , 0x01); - msleep(10); - ret |= usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev, 0x01)); ret |= lme2510_bulk_read(d->udev, buff, (rlen > 512) ? @@ -364,6 +362,7 @@ static int lme2510_msg(struct dvb_usb_device *d, msleep(80); } } + msleep(20); break; case TUNER_S7395: if (wbuf[2] == 0xd0) { @@ -376,7 +375,7 @@ static int lme2510_msg(struct dvb_usb_device *d, } } if ((wbuf[3] != 0x6) & (wbuf[3] != 0x5)) - msleep(5); + msleep(20); } break; case TUNER_S0194: @@ -389,6 +388,8 @@ static int lme2510_msg(struct dvb_usb_device *d, st->i2c_talk_onoff = 0; } } + if ((wbuf[3] != 0x9) & (wbuf[3] != 0x0a)) + msleep(20); } break; default: @@ -1222,5 +1223,5 @@ module_exit(lme2510_module_exit); MODULE_AUTHOR("Malcolm Priestley "); MODULE_DESCRIPTION("LME2510(C) DVB-S USB2.0"); -MODULE_VERSION("1.81"); +MODULE_VERSION("1.82"); MODULE_LICENSE("GPL");