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

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

Pull char/misc driver fixes from Greg KH:
 "Here are some tiny char/misc driver fixes for 5.13-rc4.

  Nothing huge here, just some tiny fixes for reported issues:

   - two interconnect driver fixes

   - kgdb build warning fix for gcc-11

   - hgafb regression fix

   - soundwire driver fix

   - mei driver fix

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

* tag 'char-misc-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  mei: request autosuspend after sending rx flow control
  kgdb: fix gcc-11 warnings harder
  video: hgafb: correctly handle card detect failure during probe
  soundwire: qcom: fix handling of qcom,ports-block-pack-mode
  interconnect: qcom: Add missing MODULE_DEVICE_TABLE
  interconnect: qcom: bcm-voter: add a missing of_node_put()
parents e1a9e3db bbf0a947

drivers/interconnect/qcom/bcm-voter.c

+3 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.

 */



#include <asm/div64.h>
@@ -205,6 +205,7 @@ struct bcm_voter *of_bcm_voter_get(struct device *dev, const char *name) 
	}

	mutex_unlock(&bcm_voter_lock);



	of_node_put(node);

	return voter;

}

EXPORT_SYMBOL_GPL(of_bcm_voter_get);
@@ -362,6 +363,7 @@ static const struct of_device_id bcm_voter_of_match[] = { 
	{ .compatible = "qcom,bcm-voter" },

	{ }

};

MODULE_DEVICE_TABLE(of, bcm_voter_of_match);



static struct platform_driver qcom_icc_bcm_voter_driver = {

	.probe = qcom_icc_bcm_voter_probe,

drivers/misc/kgdbts.c

+2 −1
Original line number Diff line number Diff line
@@ -101,8 +101,9 @@ 
		printk(KERN_INFO a);	\

} while (0)

#define v2printk(a...) do {		\

	if (verbose > 1)		\

	if (verbose > 1) {		\

		printk(KERN_INFO a);	\

	}				\

	touch_nmi_watchdog();		\

} while (0)

#define eprintk(a...) do {		\

drivers/misc/mei/interrupt.c

+3 −0
Original line number Diff line number Diff line
@@ -277,6 +277,9 @@ static int mei_cl_irq_read(struct mei_cl *cl, struct mei_cl_cb *cb, 
		return ret;

	}



	pm_runtime_mark_last_busy(dev->dev);

	pm_request_autosuspend(dev->dev);



	list_move_tail(&cb->list, &cl->rd_pending);



	return 0;

drivers/soundwire/qcom.c

+10 −2
Original line number Diff line number Diff line
@@ -1150,8 +1150,16 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl) 


	ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode",

					bp_mode, nports);

	if (ret)

	if (ret) {

		u32 version;



		ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &version);



		if (version <= 0x01030000)

			memset(bp_mode, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);

		else

			return ret;

	}



	memset(hstart, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);

	of_property_read_u8_array(np, "qcom,ports-hstart", hstart, nports);

drivers/video/fbdev/hgafb.c

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static int hgafb_probe(struct platform_device *pdev) 
	int ret;



	ret = hga_card_detect();

	if (!ret)

	if (ret)

		return ret;



	printk(KERN_INFO "hgafb: %s with %ldK of memory detected.\n",