Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2242212iof; Wed, 8 Jun 2022 00:14:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhocoHh5Ep4D+hXcExz32fgu8CV8Z0P10wSqDy7BPfiy65w0MFxkfafELYlVSzZAbkFD8r X-Received: by 2002:a05:6a00:c89:b0:51c:2ad8:47ad with SMTP id a9-20020a056a000c8900b0051c2ad847admr10548075pfv.42.1654672485113; Wed, 08 Jun 2022 00:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654672485; cv=none; d=google.com; s=arc-20160816; b=tMUCNqrkiolW13Lu94izUZbrBbuI16kGkBQ+ifvaHWazXoX/3FipBTSRlekQz4I8Fr cfv7nhix40+AJTnafXZr3Ej6j5t5Pt75Ey2vZ5MjZCXtMaO4CL1AVf/x4nIJee/zAgYp GsROZePxdzcgRuEJKlimK9R3eKY1/X+ebM8cmYZIEWJaQY9psi9NkBaZZAxKwRR1RGsn WdTzdwfoL7KHDZC+yIC8tUi3MVERBUd+705k/7qwlfCn+gbRFqv0jvfwtHdL+WktiLhL 8yjfyoJrkMcR8hAQ1DEKvb/a5AIbtspcWnPIsTsliPjsvDYDFSE7Jxb2L+rNMELOtFFM 5/WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KIsVSnWNb9eXY+6t9BaiQ6Gchhw4Ooco/QRZ7BNH0Ds=; b=AOuiPl4gYqZHJXZb8h/+EtSP0/Bz4TpeD/R6b6qZ0zhC7Q0sjTuevu+shADzjJ941y TCCZP3T/nV7uD9cJhaPd79yYf9mTRdhQHUfTsqneiVPeuuS+k4phMpBa6M3iaa8cCtNF XQUFt2ARxaPfRuDmapWcFtZHxsFSApnOSVUAaQdk0zRFKB3ohFTMGUBYVb2Z4nwdcIyy FL8CJ56TofTDYa8++nbLh30rHjJ7QFJw3Z4RWNjXtP0Tj/ivLaDLRX1qtYzlU95aVQj/ CwMs6es7vmIEMk2/S5fDFaUubl9k2jF+dpjaRvHU8pLbPaYoqCypX+u6O0A+SNmDiUE0 z27g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ihuZSHlk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 193-20020a6301ca000000b003fd55608dccsi17450092pgb.192.2022.06.08.00.14.30; Wed, 08 Jun 2022 00:14:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ihuZSHlk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1389761AbiFHAgD (ORCPT + 99 others); Tue, 7 Jun 2022 20:36:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382740AbiFGVvv (ORCPT ); Tue, 7 Jun 2022 17:51:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CB14227CFF; Tue, 7 Jun 2022 12:09:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5B8D3B82182; Tue, 7 Jun 2022 19:09:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C71B2C34115; Tue, 7 Jun 2022 19:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654628959; bh=fZ092IcvSUIN4gS+C79ycWxMkz1HT7br/u2yNYt1EfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ihuZSHlkEEWyTUtD5b6NFqjvdLhSApoXjfurQ1LhIEDsTNjiNMjmQz8Ry7oMouGKk swAUmBFtfIMApZQK8HCgwYszSa+b/AkSMnFUkuIEJ5r8wqGen3MTljHxbJDkHRYnLe scCP5vftus8fxBGaOIq8DeN0AB8uD+DGp32CdqLE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heikki Krogerus , Hans de Goede , Sasha Levin Subject: [PATCH 5.18 501/879] platform/x86: intel_cht_int33fe: Set driver data Date: Tue, 7 Jun 2022 19:00:19 +0200 Message-Id: <20220607165017.416217287@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heikki Krogerus [ Upstream commit 3ce827bf9cfecaf2cbfd9a9d44f0db9f40882780 ] Module removal fails because cht_int33fe_typec_remove() tries to access driver data that does not exist. Fixing by assigning the data at the end of probe. Fixes: 915623a80b5a ("platform/x86: intel_cht_int33fe: Switch to DMI modalias based loading") Signed-off-by: Heikki Krogerus Link: https://lore.kernel.org/r/20220519122103.78546-1-heikki.krogerus@linux.intel.com Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede Signed-off-by: Sasha Levin --- drivers/platform/x86/intel/chtwc_int33fe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/platform/x86/intel/chtwc_int33fe.c b/drivers/platform/x86/intel/chtwc_int33fe.c index 0de509fbf020..c52ac23e2331 100644 --- a/drivers/platform/x86/intel/chtwc_int33fe.c +++ b/drivers/platform/x86/intel/chtwc_int33fe.c @@ -389,6 +389,8 @@ static int cht_int33fe_typec_probe(struct platform_device *pdev) goto out_unregister_fusb302; } + platform_set_drvdata(pdev, data); + return 0; out_unregister_fusb302: -- 2.35.1