From patchwork Tue Mar 6 19:14:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Love X-Patchwork-Id: 10262433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 53C1560211 for ; Tue, 6 Mar 2018 19:15:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4434728F5F for ; Tue, 6 Mar 2018 19:15:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38DC22913C; Tue, 6 Mar 2018 19:15:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D91B528F5F for ; Tue, 6 Mar 2018 19:15:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753807AbeCFTPI (ORCPT ); Tue, 6 Mar 2018 14:15:08 -0500 Received: from sub5.mail.dreamhost.com ([208.113.200.129]:44131 "EHLO homiemail-a48.g.dreamhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753851AbeCFTPG (ORCPT ); Tue, 6 Mar 2018 14:15:06 -0500 Received: from homiemail-a48.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a48.g.dreamhost.com (Postfix) with ESMTP id 3ED2970A0D0B; Tue, 6 Mar 2018 11:15:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=nextdimension.cc; h=from :to:cc:subject:date:message-id:in-reply-to:references; s= nextdimension.cc; bh=rLsWcPS0wratitbiylHg0ly1kbI=; b=Wcvsaoun4Wk oWdZsIAH3bEXJF9neRPLtUXZCyg+UHW2SxpF0Um7zaZoK/NbQ0seY5Khv+yDa6/5 vW6pI31N0i8VQhOPOGjejniF6sYnx1sZPVA+bIXOZxMqZ7+p/Bd0+tixIYjIqV32 K75GuQ0HnAzLWoS8tNEO5JJBHx83uyQI= Received: from localhost.localdomain (66-90-189-166.dyn.grandenetworks.net [66.90.189.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: brad@nextdimension.ws) by homiemail-a48.g.dreamhost.com (Postfix) with ESMTPSA id 05F4B70A0D0E; Tue, 6 Mar 2018 11:15:05 -0800 (PST) From: Brad Love To: linux-media@vger.kernel.org Cc: Brad Love Subject: [PATCH 1/8] lgdt3306a: remove symbol count mismatch fix Date: Tue, 6 Mar 2018 13:14:55 -0600 Message-Id: <1520363702-25536-2-git-send-email-brad@nextdimension.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520363702-25536-1-git-send-email-brad@nextdimension.cc> References: <1520363702-25536-1-git-send-email-brad@nextdimension.cc> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This symbol mismatch is handled by NULL'ing out the release callback if the driver is loaded as an i2c device. This patch reverts: - 94448e21cf08b10f7dc7acdaca387594370396b0 - 835d66173a38538c072a7c393d02360dcfac8582 The symbol count mismatch is handled by: - 5b3a8e906973540b61dbf402c6b6f8d64d4ae119 Signed-off-by: Brad Love --- drivers/media/dvb-frontends/lgdt3306a.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/media/dvb-frontends/lgdt3306a.c b/drivers/media/dvb-frontends/lgdt3306a.c index 5b19033..7eb4e14 100644 --- a/drivers/media/dvb-frontends/lgdt3306a.c +++ b/drivers/media/dvb-frontends/lgdt3306a.c @@ -1814,13 +1814,7 @@ static void lgdt3306a_release(struct dvb_frontend *fe) struct lgdt3306a_state *state = fe->demodulator_priv; dbg_info("\n"); - - /* - * If state->muxc is not NULL, then we are an i2c device - * and lgdt3306a_remove will clean up state - */ - if (!state->muxc) - kfree(state); + kfree(state); } static const struct dvb_frontend_ops lgdt3306a_ops; @@ -2221,7 +2215,7 @@ static int lgdt3306a_probe(struct i2c_client *client, sizeof(struct lgdt3306a_config)); config->i2c_addr = client->addr; - fe = dvb_attach(lgdt3306a_attach, config, client->adapter); + fe = lgdt3306a_attach(config, client->adapter); if (fe == NULL) { ret = -ENODEV; goto err_fe;