From patchwork Fri Jan 16 18:36:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olli Salonen X-Patchwork-Id: 27937 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YCBlQ-00031l-UP; Fri, 16 Jan 2015 19:36:56 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1YCBlO-0000nN-0t; Fri, 16 Jan 2015 19:36:56 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752180AbbAPSgv (ORCPT + 1 other); Fri, 16 Jan 2015 13:36:51 -0500 Received: from mail-la0-f43.google.com ([209.85.215.43]:57530 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751896AbbAPSgu (ORCPT ); Fri, 16 Jan 2015 13:36:50 -0500 Received: by mail-la0-f43.google.com with SMTP id q1so5015032lam.2 for ; Fri, 16 Jan 2015 10:36:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=lId7r8hpi5QwgyrWBpkf0XnvEfFfn3OuffzYJEHL4ZM=; b=Pu9mjBS7XyO8qzCi5wq/GSQs5wxwRGvP8HsZh+0FH5x5aKpboxAvjrneaBoixyzvHF SRl4h+X/EQsdApKRdXu+nPoyy1YNKAFQyzynSwEmKflDEBZ0HWPEuzc2mWAgzAar40Lb Ctguot//cUiJuAVRxa978xnvzLH3PpGG7f1OCZUhpk44lC0R6x9RSuLDwIgX0RIiBV6d tu8V70aNzVofeHOtpRJ0Y+KqihJ2tl4jk/SaS8votdzj6EC5ThuBYXlhDyY46Ti9H/CO +Rz0cEli1GbgWlAOcLRus+ScjIhgXwHSkg2/BgEslr8jd8QCYzUWnBgG44Ij4ftOYM3E MvRA== X-Gm-Message-State: ALoCoQln0QoSBeUALV6nxMJ991Suqki6mJe0GFVmiPYDnH0Wc6WWSJ3Yp5HpuvoW7H/cck2T1Nuz X-Received: by 10.112.64.35 with SMTP id l3mr17035757lbs.82.1421433409127; Fri, 16 Jan 2015 10:36:49 -0800 (PST) Received: from dl160.lan (37-33-15-55.bb.dnainternet.fi. [37.33.15.55]) by mx.google.com with ESMTPSA id 10sm1633180lar.24.2015.01.16.10.36.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Jan 2015 10:36:48 -0800 (PST) From: Olli Salonen To: linux-media@vger.kernel.org Cc: Olli Salonen Subject: [PATCHv2] si2168: return error if set_frontend is called with invalid parameters Date: Fri, 16 Jan 2015 20:36:38 +0200 Message-Id: <1421433398-1541-1-git-send-email-olli.salonen@iki.fi> X-Mailer: git-send-email 1.9.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.1.16.182421 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1300_1399 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' This patch is based on Antti's silabs branch. According to dvb-frontend.h set_frontend may be called with bandwidth_hz set to 0 if automatic bandwidth is required. Si2168 does not support automatic bandwidth and does not declare FE_CAN_BANDWIDTH_AUTO in caps. This patch will change the behaviour in a way that EINVAL is returned if bandwidth_hz is 0. v2: remove error message, remove line break to comply with coding style. Signed-off-by: Olli Salonen Reviewed-by: Antti Palosaari --- drivers/media/dvb-frontends/si2168.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c index 7f966f3..85acc54 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -180,7 +180,10 @@ static int si2168_set_frontend(struct dvb_frontend *fe) goto err; } - if (c->bandwidth_hz <= 5000000) + if (c->bandwidth_hz == 0) { + ret = -EINVAL; + goto err; + } else if (c->bandwidth_hz <= 5000000) bandwidth = 0x05; else if (c->bandwidth_hz <= 6000000) bandwidth = 0x06;