From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41902C433E1 for ; Thu, 13 Aug 2020 21:47:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1DC4620829 for ; Thu, 13 Aug 2020 21:47:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726567AbgHMVrG (ORCPT ); Thu, 13 Aug 2020 17:47:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726192AbgHMVrG (ORCPT ); Thu, 13 Aug 2020 17:47:06 -0400 Received: from mail.tuxforce.de (tuxforce.de [IPv6:2a00:5080:1:16d::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E74C2C061757 for ; Thu, 13 Aug 2020 14:47:05 -0700 (PDT) Received: from desktop.fritz.box (2001-4dd5-ac5b-0-6dff-1ee7-1f0b-53a0.ipv6dyn.netcologne.de [IPv6:2001:4dd5:ac5b:0:6dff:1ee7:1f0b:53a0]) by mail.tuxforce.de (Postfix) with ESMTPSA id E75C152008B; Thu, 13 Aug 2020 23:47:02 +0200 (CEST) From: Lukas Middendorf To: linux-media@vger.kernel.org Cc: Antti Palosaari , Mauro Carvalho Chehab , Luis Chamberlain , Lukas Middendorf Subject: [PATCH 1/2] media: si2168: request caching of firmware to make it available on resume Date: Thu, 13 Aug 2020 23:45:37 +0200 Message-Id: <20200813214538.8474-1-kernel@tuxforce.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org even though request_firmware() is supposed to be safe to call during resume, it might fail (or even hang the system) when the firmware has not been loaded previously. Use firmware_request_cache() to have it cached so it is available reliably on resume. Signed-off-by: Lukas Middendorf --- drivers/media/dvb-frontends/si2168.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c index 14b93a7d3358..ea4b2d91697e 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -757,6 +757,17 @@ static int si2168_probe(struct i2c_client *client, dev->version >> 24 & 0xff, dev->version >> 16 & 0xff, dev->version >> 8 & 0xff, dev->version >> 0 & 0xff); + /* request caching of the firmware so it is available on resume after suspend. + * The actual caching of the firmware file only occurs during suspend + * The return value does not show whether the firmware file exists + */ + ret = firmware_request_cache(&client->dev, dev->firmware_name); + if (ret) { + dev_err(&client->dev, + "firmware caching for '%s' failed\n", + dev->firmware_name); + } + return 0; err_kfree: kfree(dev); -- 2.26.2