From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Feb 2023 19:52:23 +0000 (-0800)
Subject: Merge tag 'char-misc-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/d3feaff4d9492aa05b94167e170858da81159654?hp=-c

Merge tag 'char-misc-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
 "Here are a number of small char/misc/whatever driver fixes. They
  include:

   - IIO driver fixes for some reported problems

   - nvmem driver fixes

   - fpga driver fixes

   - debugfs memory leak fix in the hv_balloon and irqdomain code
     (irqdomain change was acked by the maintainer)

  All have been in linux-next with no reported problems"

* tag 'char-misc-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (33 commits)
  kernel/irq/irqdomain.c: fix memory leak with using debugfs_lookup()
  HV: hv_balloon: fix memory leak with using debugfs_lookup()
  nvmem: qcom-spmi-sdam: fix module autoloading
  nvmem: core: fix return value
  nvmem: core: fix cell removal on error
  nvmem: core: fix device node refcounting
  nvmem: core: fix registration vs use race
  nvmem: core: fix cleanup after dev_set_name()
  nvmem: core: remove nvmem_config wp_gpio
  nvmem: core: initialise nvmem->id early
  nvmem: sunxi_sid: Always use 32-bit MMIO reads
  nvmem: brcm_nvram: Add check for kzalloc
  iio: imu: fxos8700: fix MAGN sensor scale and unit
  iio: imu: fxos8700: remove definition FXOS8700_CTRL_ODR_MIN
  iio: imu: fxos8700: fix failed initialization ODR mode assignment
  iio: imu: fxos8700: fix incorrect ODR mode readback
  iio: light: cm32181: Fix PM support on system with 2 I2C resources
  iio: hid: fix the retval in gyro_3d_capture_sample
  iio: hid: fix the retval in accel_3d_capture_sample
  iio: imu: st_lsm6dsx: fix build when CONFIG_IIO_TRIGGERED_BUFFER=m
  ...
---

d3feaff4d9492aa05b94167e170858da81159654
diff --combined kernel/irq/irqdomain.c
index 5c3fb6168eef,e2096b51c004..798a9042421f
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@@ -114,7 -114,7 +114,7 @@@ void irq_domain_free_fwnode(struct fwno
  {
  	struct irqchip_fwid *fwid;
  
 -	if (WARN_ON(!is_fwnode_irqchip(fwnode)))
 +	if (!fwnode || WARN_ON(!is_fwnode_irqchip(fwnode)))
  		return;
  
  	fwid = container_of(fwnode, struct irqchip_fwid, fwnode);
@@@ -1915,7 -1915,7 +1915,7 @@@ static void debugfs_add_domain_dir(stru
  
  static void debugfs_remove_domain_dir(struct irq_domain *d)
  {
- 	debugfs_remove(debugfs_lookup(d->name, domain_dir));
+ 	debugfs_lookup_and_remove(d->name, domain_dir);
  }
  
  void __init irq_domain_debugfs_init(struct dentry *root)