Commit 0e36fd45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc fixes from Greg KH:
 "Here are some small char/misc driver fixes for 5.7-rc7 that resolve
  some reported issues. Included in here are tiny fixes for the mei,
  coresight, rtsx, ipack, and mhi drivers.

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

* tag 'char-misc-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  misc: rtsx: Add short delay after exit from ASPM
  bus: mhi: core: Fix some error return code
  ipack: tpci200: fix error return code in tpci200_register()
  coresight: cti: remove incorrect NULL return check
  mei: release me_cl object reference
parents 8f261041 7a839dba

drivers/bus/mhi/core/init.c

+2 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl) 
	}



	/* Setup cmd context */

	ret = -ENOMEM;

	mhi_ctxt->cmd_ctxt = mhi_alloc_coherent(mhi_cntrl,

						sizeof(*mhi_ctxt->cmd_ctxt) *

						NR_OF_CMD_RINGS,
@@ -1100,6 +1101,7 @@ static int mhi_driver_probe(struct device *dev) 
		}

	}



	ret = -EINVAL;

	if (dl_chan) {

		/*

		 * If channel supports LPM notifications then status_cb should

drivers/hwtracing/coresight/coresight-cti-platform.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int cti_plat_create_v8_etm_connection(struct device *dev, 


	/* Can optionally have an etm node - return if not  */

	cs_fwnode = fwnode_find_reference(root_fwnode, CTI_DT_CSDEV_ASSOC, 0);

	if (IS_ERR_OR_NULL(cs_fwnode))

	if (IS_ERR(cs_fwnode))

		return 0;



	/* allocate memory */
@@ -393,7 +393,7 @@ static int cti_plat_create_connection(struct device *dev, 
		/* associated device ? */

		cs_fwnode = fwnode_find_reference(fwnode,

						  CTI_DT_CSDEV_ASSOC, 0);

		if (!IS_ERR_OR_NULL(cs_fwnode)) {

		if (!IS_ERR(cs_fwnode)) {

			assoc_name = cti_plat_get_csdev_or_node_name(cs_fwnode,

								     &csdev);

			fwnode_handle_put(cs_fwnode);

drivers/ipack/carriers/tpci200.c

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ static int tpci200_register(struct tpci200_board *tpci200) 
			"(bn 0x%X, sn 0x%X) failed to map driver user space!",

			tpci200->info->pdev->bus->number,

			tpci200->info->pdev->devfn);

		res = -ENOMEM;

		goto out_release_mem8_space;

	}

drivers/misc/cardreader/rtsx_pcr.c

+3 −0
Original line number Diff line number Diff line
@@ -142,6 +142,9 @@ static void rtsx_comm_pm_full_on(struct rtsx_pcr *pcr) 


	rtsx_disable_aspm(pcr);



	/* Fixes DMA transfer timout issue after disabling ASPM on RTS5260 */

	msleep(1);



	if (option->ltr_enabled)

		rtsx_set_ltr_latency(pcr, option->ltr_active_latency);

drivers/misc/mei/client.c

+2 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ void mei_me_cl_rm_by_uuid(struct mei_device *dev, const uuid_le *uuid) 
	down_write(&dev->me_clients_rwsem);

	me_cl = __mei_me_cl_by_uuid(dev, uuid);

	__mei_me_cl_del(dev, me_cl);

	mei_me_cl_put(me_cl);

	up_write(&dev->me_clients_rwsem);

}
@@ -287,6 +288,7 @@ void mei_me_cl_rm_by_uuid_id(struct mei_device *dev, const uuid_le *uuid, u8 id) 
	down_write(&dev->me_clients_rwsem);

	me_cl = __mei_me_cl_by_uuid_id(dev, uuid, id);

	__mei_me_cl_del(dev, me_cl);

	mei_me_cl_put(me_cl);

	up_write(&dev->me_clients_rwsem);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE