diff mbox series

[5.10,081/188] i2c: turn recovery error on init to debug

Message ID	20210412084016.337371761@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Klaus Kudielka <klaus.kudielka@gmail.com>, Wolfram Sang <wsa+renesas@sang-engineering.com>, Wolfram Sang <wsa@kernel.org>, stable@kernel.org Subject: [PATCH 5.10 081/188] i2c: turn recovery error on init to debug Date: Mon, 12 Apr 2021 10:39:55 +0200 Message-Id: <20210412084016.337371761@linuxfoundation.org> In-Reply-To: <20210412084013.643370347@linuxfoundation.org> References: <20210412084013.643370347@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,003/188] ALSA: hda/realtek: Fix speaker amp setup on Acer Aspire E1 [5.10,004/188] ALSA: hda/conexant: Apply quirk for another HP ZBook G5 model [5.10,007/188] nfc: fix refcount leak in llcp_sock_connect() [5.10,009/188] nfc: Avoid endless loops caused by repeated llcp_sock_connect() [5.10,010/188] selinux: make nslot handling in avtab more robust [5.10,011/188] selinux: fix cond_list corruption when changing booleans [5.10,013/188] xen/evtchn: Change irq_info lock to raw_spinlock_t [5.10,015/188] net: dsa: lantiq_gswip: Let GSWIP automatically set the xMII clock [5.10,016/188] net: dsa: lantiq_gswip: Dont use PHY auto polling [5.10,017/188] net: dsa: lantiq_gswip: Configure all remaining GSWIP_MII_CFG bits [5.10,020/188] IB/hfi1: Fix probe time panic when AIP is enabled with a buggy BIOS [5.10,021/188] LOOKUP_MOUNTPOINT: we are cleaning "jumped" flag too late [5.10,022/188] gcov: re-fix clang-11+ support [5.10,023/188] ia64: fix user_stack_pointer() for ptrace() [5.10,025/188] ocfs2: fix deadlock between setattr and dio_end_io_write [5.10,028/188] of: property: fw_devlink: do not link ".*,nr-gpios" [5.10,031/188] ARM: dts: turris-omnia: configure LED[2]/INTn pin as interrupt pin [5.10,033/188] ice: Continue probe on link/PHY errors [5.10,035/188] ice: prevent ice_open and ice_stop during reset [5.10,036/188] ice: fix memory allocation call [5.10,039/188] ice: Use port number instead of PF ID for WoL [5.10,040/188] ice: Cleanup fltr list in case of allocation issues [5.10,042/188] ice: fix memory leak of aRFS after resuming from suspend [5.10,046/188] bpf: link: Refuse non-O_RDWR flags in BPF_OBJ_GET [5.10,047/188] ethernet/netronome/nfp: Fix a use after free in nfp_bpf_ctrl_msg_rx [5.10,048/188] libbpf: Ensure umem pointer is non-NULL before dereferencing [5.10,053/188] bpf, sockmap: Fix incorrect fwd_alloc accounting [5.10,054/188] net: ensure mac header is set in virtio_net_hdr_to_skb() [5.10,057/188] i40e: Fix sparse error: vsi->netdev could be null [5.10,058/188] i40e: Fix sparse error: uninitialized symbol ring [5.10,059/188] i40e: Fix sparse errors in i40e_txrx.c [5.10,060/188] vdpa/mlx5: Fix suspend/resume index restoration [5.10,062/188] net: sched: fix action overwrite reference counting [5.10,064/188] nl80211: fix potential leak of ACL params [5.10,066/188] mac80211: fix time-is-after bug in mlme [5.10,070/188] net: let skb_orphan_partial wake-up waiters. [5.10,072/188] thunderbolt: Fix off by one in tb_port_find_retimer() [5.10,074/188] usbip: stub-dev synchronize sysfs code paths [5.10,077/188] driver core: Fix locking bug in deferred_probe_timeout_work_func() [5.10,078/188] scsi: pm80xx: Fix chip initialization failure [5.10,080/188] percpu: make pcpu_nr_empty_pop_pages per chunk type [5.10,081/188] i2c: turn recovery error on init to debug [5.10,083/188] KVM: x86/mmu: Merge flush and non-flush tdp_mmu_iter_cond_resched [5.10,085/188] KVM: x86/mmu: Ensure forward progress when yielding in TDP MMU iter [5.10,087/188] KVM: x86/mmu: Ensure TLBs are flushed when yielding during GFN range zap [5.10,089/188] KVM: x86/mmu: Dont allow TDP MMU to yield when recovering NX pages [5.10,094/188] xfrm: interface: fix ipv4 pmtu check to honor ip header df [5.10,095/188] xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume [5.10,096/188] remoteproc: qcom: pil_info: avoid 64-bit division [5.10,098/188] ARM: OMAP4: Fix PMIC voltage domains for bionic [5.10,102/188] ASoC: SOF: Intel: HDA: fix core status verification [5.10,103/188] ASoC: wm8960: Fix wrong bclk and lrclk with pll enabled for some chips [5.10,104/188] xfrm: Fix NULL pointer dereference on policy lookup [5.10,106/188] i40e: Added Asym_Pause to supported link modes [5.10,108/188] hostfs: fix memory handling in follow_link() [5.10,109/188] amd-xgbe: Update DMA coherency values [5.10,111/188] geneve: do not modify the shared tunnel info when PMTU triggers an ICMP reply [5.10,114/188] arm64: dts: imx8mm/q: Fix pad control of SD1_DATA0 [5.10,116/188] can: bcm/raw: fix msg_namelen values depending on CAN_REQUIRED_SIZE [5.10,117/188] can: isotp: fix msg_namelen values depending on CAN_REQUIRED_SIZE [5.10,119/188] ethernet: myri10ge: Fix a use after free in myri10ge_sw_tso [5.10,120/188] gianfar: Handle error code at MAC address change [5.10,122/188] cxgb4: avoid collecting SGE_QBASE regs during traffic [5.10,125/188] net/ncsi: Avoid channel_monitor hrtimer deadlock [5.10,126/188] net: qrtr: Fix memory leak on qrtr_tx_wait failure [5.10,127/188] nfp: flower: ignore duplicate merge hints from FW [5.10,130/188] ASoC: sunxi: sun4i-codec: fill ASoC card owner [5.10,132/188] net/mlx5e: Fix ethtool indication of connector type [5.10,134/188] net/rds: Fix a use after free in rds_message_map_pages [5.10,136/188] soc/fsl: qbman: fix conflicting alignment attributes [5.10,138/188] RDMA/rtrs-clt: Close rtrs client conn before destroying rtrs clt session files [5.10,140/188] net: udp: Add support for getsockopt(..., ..., UDP_GRO, ..., ...); [5.10,142/188] scsi: ufs: core: Fix task management request completion timeout [5.10,144/188] net: cls_api: Fix uninitialised struct field bo->unlocked_driver_cb [5.10,146/188] clk: fix invalid usage of list cursor in register [5.10,147/188] clk: fix invalid usage of list cursor in unregister [5.10,152/188] openvswitch: fix send of uninitialized stack memory in ct limit reply [5.10,153/188] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set [5.10,154/188] iwlwifi: fix 11ax disabled bit in the regulatory capability flags [5.10,156/188] tipc: increment the tmp aead refcnt before attaching it [5.10,157/188] net: hns3: clear VF down state bit before request link status [5.10,159/188] net/mlx5: Fix PPLM register mapping [5.10,161/188] RDMA/cxgb4: check for ipv6 address properly while destroying listener [5.10,162/188] perf report: Fix wrong LBR block sorting [5.10,163/188] RDMA/qedr: Fix kernel panic when trying to access recv_cq [5.10,165/188] i40e: Fix parameters in aq_get_phy_register() [5.10,168/188] vdpa/mlx5: Fix wrong use of bit numbers [5.10,170/188] clk: socfpga: fix iomem pointer cast on 64-bit [5.10,171/188] lockdep: Address clang -Wformat warning printing for %hd [5.10,172/188] dt-bindings: net: ethernet-controller: fix typo in NVMEM [5.10,173/188] net: sched: bump refcount for new action in ACT replace mode [5.10,175/188] cfg80211: remove WARN_ON() in cfg80211_sme_connect [5.10,177/188] drivers: net: fix memory leak in atusb_probe [5.10,179/188] net: mac802154: Fix general protection fault [5.10,180/188] net: ieee802154: nl-mac: fix check on panid [5.10,183/188] net: ieee802154: fix nl802154 add llsec key [5.10,186/188] net: ieee802154: forbid monitor for del llsec seclevel [5.10,188/188] Revert "net: sched: bump refcount for new action in ACT replace mode"

Commit Message

Greg Kroah-Hartman April 12, 2021, 8:39 a.m. UTC

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

commit e409a6a3e0690efdef9b8a96197bc61ff117cfaf upstream.

In some configurations, recovery is optional. So, don't throw an error
when it is not used because e.g. pinctrl settings for recovery are not
provided. Reword the message and make it debug output.

Reported-by: Klaus Kudielka <klaus.kudielka@gmail.com>
Tested-by: Klaus Kudielka <klaus.kudielka@gmail.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/i2c/i2c-core-base.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff mbox series

Patch

--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -378,7 +378,7 @@  static int i2c_gpio_init_recovery(struct
 static int i2c_init_recovery(struct i2c_adapter *adap)
 {
 	struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
-	char *err_str;
+	char *err_str, *err_level = KERN_ERR;
 
 	if (!bri)
 		return 0;
@@ -387,7 +387,8 @@  static int i2c_init_recovery(struct i2c_
 		return -EPROBE_DEFER;
 
 	if (!bri->recover_bus) {
-		err_str = "no recover_bus() found";
+		err_str = "no suitable method provided";
+		err_level = KERN_DEBUG;
 		goto err;
 	}
 
@@ -414,7 +415,7 @@  static int i2c_init_recovery(struct i2c_
 
 	return 0;
  err:
-	dev_err(&adap->dev, "Not using recovery: %s\n", err_str);
+	dev_printk(err_level, &adap->dev, "Not using recovery: %s\n", err_str);
 	adap->bus_recovery_info = NULL;
 
 	return -EINVAL;