Commit 2cc699b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc/IIO driver fixes from Greg KH:
 "Here are a number of misc and char and iio driver fixes that have been
  sitting in my tree for way too long. They contain:

   - iio driver fixes for reported issues

   - regression fix for rtsx_usb card reader

   - mei and mhi driver fixes

   - small virt driver fixes

   - ntsync permissions fix

   - other tiny driver fixes for reported problems.

  All of these have been in linux-next for quite a while with no
  reported issues"

* tag 'char-misc-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (30 commits)
  Revert "drivers/card_reader/rtsx_usb: Restore interrupt based detection"
  ntsync: Check wait count based on byte size.
  bus: simple-pm-bus: fix forced runtime PM use
  char: misc: deallocate static minor in error path
  eeprom: digsy_mtc: Make GPIO lookup table match the device
  drivers: virt: acrn: hsm: Use kzalloc to avoid info leak in pmcmd_ioctl
  binderfs: fix use-after-free in binder_devices
  slimbus: messaging: Free transaction ID in delayed interrupt scenario
  vbox: add HAS_IOPORT dependency
  cdx: Fix possible UAF error in driver_override_show()
  intel_th: pci: Add Panther Lake-P/U support
  intel_th: pci: Add Panther Lake-H support
  intel_th: pci: Add Arrow Lake support
  intel_th: msu: Fix less trivial kernel-doc warnings
  intel_th: msu: Fix kernel-doc warnings
  MAINTAINERS: change maintainer for FSI
  ntsync: Set the permissions to be 0666
  bus: mhi: host: pci_generic: Use pci_try_reset_function() to avoid deadlock
  mei: vsc: Use "wakeuphostint" when getting the host wakeup GPIO
  mei: me: add panther lake P DID
  ...
parents a382b06d 2397d61e

Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ properties: 
    maxItems: 2



  pwm-names:

    minItems: 1

    items:

      - const: convst1

      - const: convst2

MAINTAINERS

+2 −5
Original line number Diff line number Diff line
@@ -9443,14 +9443,11 @@ F: include/linux/fscrypt.h 
F:	include/uapi/linux/fscrypt.h









FSI SUBSYSTEM









M:	Jeremy Kerr <jk@ozlabs.org>









M:	Joel Stanley <joel@jms.id.au>









R:	Alistar Popple <alistair@popple.id.au>









R:	Eddie James <eajames@linux.ibm.com>









M:	Eddie James <eajames@linux.ibm.com>









R:	Ninad Palsule <ninad@linux.ibm.com>









L:	linux-fsi@lists.ozlabs.org









S:	Supported









Q:	http://patchwork.ozlabs.org/project/linux-fsi/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git









F:	drivers/fsi/









F:	include/linux/fsi*.h









F:	include/trace/events/fsi*.h
































drivers/android/binderfs.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -274,6 +274,7 @@ static void binderfs_evict_inode(struct inode *inode)







	mutex_unlock(&binderfs_minors_mutex);



















	if (refcount_dec_and_test(&device->ref)) {









		hlist_del_init(&device->hlist);









		kfree(device->context.name);









		kfree(device);









	}
































drivers/bus/mhi/host/pci_generic.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -1095,8 +1095,9 @@ static void mhi_pci_recovery_work(struct work_struct *work)







err_unprepare:









	mhi_unprepare_after_power_down(mhi_cntrl);









err_try_reset:









	if (pci_reset_function(pdev))









		dev_err(&pdev->dev, "Recovery failed\n");









	err = pci_try_reset_function(pdev);









	if (err)









		dev_err(&pdev->dev, "Recovery failed: %d\n", err);









}



















static void health_check(struct timer_list *t)
































drivers/bus/simple-pm-bus.c



+21
−1






























Original line number
Diff line number
Diff line







@@ -109,9 +109,29 @@ static int simple_pm_bus_runtime_resume(struct device *dev)







	return 0;









}



















static int simple_pm_bus_suspend(struct device *dev)









{









	struct simple_pm_bus *bus = dev_get_drvdata(dev);



















	if (!bus)









		return 0;



















	return pm_runtime_force_suspend(dev);









}



















static int simple_pm_bus_resume(struct device *dev)









{









	struct simple_pm_bus *bus = dev_get_drvdata(dev);



















	if (!bus)









		return 0;



















	return pm_runtime_force_resume(dev);









}



















static const struct dev_pm_ops simple_pm_bus_pm_ops = {









	RUNTIME_PM_OPS(simple_pm_bus_runtime_suspend, simple_pm_bus_runtime_resume, NULL)









	NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)









	NOIRQ_SYSTEM_SLEEP_PM_OPS(simple_pm_bus_suspend, simple_pm_bus_resume)









};



















#define ONLY_BUS	((void *) 1) /* Match if the device is only a bus. */