Commit bc94632c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.19-rc3-take2' of... 

Merge tag 'char-misc-5.19-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes for real from Greg KH:
 "Let's tag the proper branch this time...

  Here are some small char/misc driver fixes for 5.19-rc3 that resolve
  some reported issues.

  They include:

   - mei driver fixes

   - comedi driver fix

   - rtsx build warning fix

   - fsl-mc-bus driver fix

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

This is what the merge in commit f0ec9c65 _should_ have merged, but
Greg fat-fingered the pull request and I got some small changes from
linux-next instead there. Credit to Nathan Chancellor for eagle-eyes.

Link: https://lore.kernel.org/all/Yqywy+Md2AfGDu8v@dev-arch.thelio-3990X/

* tag 'char-misc-5.19-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  bus: fsl-mc-bus: fix KASAN use-after-free in fsl_mc_bus_remove()
  mei: me: add raptor lake point S DID
  mei: hbm: drop capability response on early shutdown
  mei: me: set internal pg flag to off on hardware reset
  misc: rtsx: Fix clang -Wsometimes-uninitialized in rts5261_init_from_hw()
  comedi: vmk80xx: fix expression for tx buffer size
parents ee4eb6ee 928ea982

drivers/bus/fsl-mc/fsl-mc-bus.c

+3 −3
Original line number Diff line number Diff line
@@ -1239,14 +1239,14 @@ static int fsl_mc_bus_probe(struct platform_device *pdev) 
static int fsl_mc_bus_remove(struct platform_device *pdev)

{

	struct fsl_mc *mc = platform_get_drvdata(pdev);

	struct fsl_mc_io *mc_io;



	if (!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev))

		return -EINVAL;



	mc_io = mc->root_mc_bus_dev->mc_io;

	fsl_mc_device_remove(mc->root_mc_bus_dev);



	fsl_destroy_mc_io(mc->root_mc_bus_dev->mc_io);

	mc->root_mc_bus_dev->mc_io = NULL;

	fsl_destroy_mc_io(mc_io);



	bus_unregister_notifier(&fsl_mc_bus_type, &fsl_mc_nb);

drivers/comedi/drivers/vmk80xx.c

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev) 
	if (!devpriv->usb_rx_buf)

		return -ENOMEM;



	size = max(usb_endpoint_maxp(devpriv->ep_rx), MIN_BUF_SIZE);

	size = max(usb_endpoint_maxp(devpriv->ep_tx), MIN_BUF_SIZE);

	devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL);

	if (!devpriv->usb_tx_buf)

		return -ENOMEM;

drivers/misc/cardreader/rts5261.c

+2 −0
Original line number Diff line number Diff line
@@ -407,6 +407,8 @@ static void rts5261_init_from_hw(struct rtsx_pcr *pcr) 
		// default

		setting_reg1 = PCR_SETTING_REG1;

		setting_reg2 = PCR_SETTING_REG2;

	} else {

		return;

	}



	pci_read_config_dword(pdev, setting_reg2, &lval2);

drivers/misc/mei/hbm.c

+2 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,8 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr) 


		if (dev->dev_state != MEI_DEV_INIT_CLIENTS ||

		    dev->hbm_state != MEI_HBM_CAP_SETUP) {

			if (dev->dev_state == MEI_DEV_POWER_DOWN) {

			if (dev->dev_state == MEI_DEV_POWER_DOWN ||

			    dev->dev_state == MEI_DEV_POWERING_DOWN) {

				dev_dbg(dev->dev, "hbm: capabilities response: on shutdown, ignoring\n");

				return 0;

			}

drivers/misc/mei/hw-me-regs.h

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ 
#define MEI_DEV_ID_ADP_P      0x51E0  /* Alder Lake Point P */

#define MEI_DEV_ID_ADP_N      0x54E0  /* Alder Lake Point N */



#define MEI_DEV_ID_RPL_S      0x7A68  /* Raptor Lake Point S */



/*

 * MEI HW Section

 */