Commit 080eba78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver fixes from Greg KH:
 "Here are a small number of char/misc driver fixes for 5.17-rc4 for
  reported issues. They contain:

   - phy driver fixes

   - iio driver fix

   - eeprom driver fix

   - speakup regression fix

   - fastrpc fix

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

* tag 'char-misc-5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  iio: buffer: Fix file related error handling in IIO_BUFFER_GET_FD_IOCTL
  speakup-dectlk: Restore pitch setting
  bus: mhi: pci_generic: Add mru_default for Cinterion MV31-W
  bus: mhi: pci_generic: Add mru_default for Foxconn SDX55
  eeprom: ee1004: limit i2c reads to I2C_SMBUS_BLOCK_MAX
  misc: fastrpc: avoid double fput() on failed usercopy
  phy: dphy: Correct clk_pre parameter
  phy: phy-mtk-tphy: Fix duplicated argument in phy-mtk-tphy
  phy: stm32: fix a refcount leak in stm32_usbphyc_pll_enable()
  phy: xilinx: zynqmp: Fix bus width setting for SGMII
  phy: cadence: Sierra: fix error handling bugs in probe()
  phy: ti: Fix missing sentinel for clk_div_table
  phy: broadcom: Kconfig: Fix PHY_BRCM_USB config option
  phy: usb: Leave some clocks running during suspend
parents dcd72f54 c72ea205

drivers/accessibility/speakup/speakup_dectlk.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static struct var_t vars[] = { 
	{ CAPS_START, .u.s = {"[:dv ap 160] " } },

	{ CAPS_STOP, .u.s = {"[:dv ap 100 ] " } },

	{ RATE, .u.n = {"[:ra %d] ", 180, 75, 650, 0, 0, NULL } },

	{ PITCH, .u.n = {"[:dv ap %d] ", 122, 50, 350, 0, 0, NULL } },

	{ INFLECTION, .u.n = {"[:dv pr %d] ", 100, 0, 10000, 0, 0, NULL } },

	{ VOL, .u.n = {"[:dv g5 %d] ", 86, 60, 86, 0, 0, NULL } },

	{ PUNCT, .u.n = {"[:pu %c] ", 0, 0, 2, 0, 0, "nsa" } },

drivers/bus/mhi/pci_generic.c

+2 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = { 
	.config = &modem_foxconn_sdx55_config,

	.bar_num = MHI_PCI_DEFAULT_BAR_NUM,

	.dma_data_width = 32,

	.mru_default = 32768,

	.sideband_wake = false,

};
@@ -401,6 +402,7 @@ static const struct mhi_pci_dev_info mhi_mv31_info = { 
	.config = &modem_mv31_config,

	.bar_num = MHI_PCI_DEFAULT_BAR_NUM,

	.dma_data_width = 32,

	.mru_default = 32768,

};



static const struct mhi_channel_config mhi_sierra_em919x_channels[] = {

drivers/gpu/drm/bridge/nwl-dsi.c

+5 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/bitfield.h>

#include <linux/bits.h>

#include <linux/clk.h>

#include <linux/irq.h>

#include <linux/math64.h>
@@ -196,12 +197,9 @@ static u32 ps2bc(struct nwl_dsi *dsi, unsigned long long ps) 
/*

 * ui2bc - UI time periods to byte clock cycles

 */

static u32 ui2bc(struct nwl_dsi *dsi, unsigned long long ui)

static u32 ui2bc(unsigned int ui)

{

	u32 bpp = mipi_dsi_pixel_format_to_bpp(dsi->format);



	return DIV64_U64_ROUND_UP(ui * dsi->lanes,

				  dsi->mode.clock * 1000 * bpp);

	return DIV_ROUND_UP(ui, BITS_PER_BYTE);

}



/*
@@ -232,12 +230,12 @@ static int nwl_dsi_config_host(struct nwl_dsi *dsi) 
	}



	/* values in byte clock cycles */

	cycles = ui2bc(dsi, cfg->clk_pre);

	cycles = ui2bc(cfg->clk_pre);

	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_t_pre: 0x%x\n", cycles);

	nwl_dsi_write(dsi, NWL_DSI_CFG_T_PRE, cycles);

	cycles = ps2bc(dsi, cfg->lpx + cfg->clk_prepare + cfg->clk_zero);

	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_tx_gap (pre): 0x%x\n", cycles);

	cycles += ui2bc(dsi, cfg->clk_pre);

	cycles += ui2bc(cfg->clk_pre);

	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_t_post: 0x%x\n", cycles);

	nwl_dsi_write(dsi, NWL_DSI_CFG_T_POST, cycles);

	cycles = ps2bc(dsi, cfg->hs_exit);

drivers/iio/industrialio-buffer.c

+11 −3
Original line number Diff line number Diff line
@@ -1569,9 +1569,17 @@ static long iio_device_buffer_getfd(struct iio_dev *indio_dev, unsigned long arg 
	}



	if (copy_to_user(ival, &fd, sizeof(fd))) {

		put_unused_fd(fd);

		ret = -EFAULT;

		goto error_free_ib;

		/*

		 * "Leak" the fd, as there's not much we can do about this

		 * anyway. 'fd' might have been closed already, as

		 * anon_inode_getfd() called fd_install() on it, which made

		 * it reachable by userland.

		 *

		 * Instead of allowing a malicious user to play tricks with

		 * us, rely on the process exit path to do any necessary

		 * cleanup, as in releasing the file, if still needed.

		 */

		return -EFAULT;

	}



	return 0;

drivers/misc/eeprom/ee1004.c

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ static ssize_t ee1004_eeprom_read(struct i2c_client *client, char *buf, 
	if (offset + count > EE1004_PAGE_SIZE)

		count = EE1004_PAGE_SIZE - offset;



	if (count > I2C_SMBUS_BLOCK_MAX)

		count = I2C_SMBUS_BLOCK_MAX;



	return i2c_smbus_read_i2c_block_data_or_emulated(client, offset, count, buf);

}