Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull char/misc fixes from Greg KH:
 "Here are a few small char/misc driver fixes for 4.10-rc3.

  Two MEI driver fixes, and three NVMEM patches for reported issues, and
  a new Hyper-V driver MAINTAINER update. Nothing major at all, all have
  been in linux-next with no reported issues"

* tag 'char-misc-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  hyper-v: Add myself as additional MAINTAINER
  nvmem: fix nvmem_cell_read() return type doc
  nvmem: imx-ocotp: Fix wrong register size
  nvmem: qfprom: Allow single byte accesses for read/write
  mei: move write cb to completion on credentials failures
  mei: bus: fix mei_cldev_enable KDoc
parents 6ea17ed1 421463b8

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5965,6 +5965,7 @@ F: drivers/media/platform/sti/hva 
Hyper-V CORE AND DRIVERS

M:	"K. Y. Srinivasan" <kys@microsoft.com>

M:	Haiyang Zhang <haiyangz@microsoft.com>

M:	Stephen Hemminger <sthemmin@microsoft.com>

L:	devel@linuxdriverproject.org

S:	Maintained

F:	arch/x86/include/asm/mshyperv.h

drivers/misc/mei/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ bool mei_cldev_enabled(struct mei_cl_device *cldev) 
EXPORT_SYMBOL_GPL(mei_cldev_enabled);



/**

 * mei_cldev_enable_device - enable me client device

 * mei_cldev_enable - enable me client device

 *     create connection with me client

 *

 * @cldev: me client device

drivers/misc/mei/client.c

+12 −8
Original line number Diff line number Diff line
@@ -1541,7 +1541,7 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb, 


	rets = first_chunk ? mei_cl_tx_flow_ctrl_creds(cl) : 1;

	if (rets < 0)

		return rets;

		goto err;



	if (rets == 0) {

		cl_dbg(dev, cl, "No flow control credentials: not sending.\n");
@@ -1575,11 +1575,8 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb, 
			cb->buf.size, cb->buf_idx);



	rets = mei_write_message(dev, &mei_hdr, buf->data + cb->buf_idx);

	if (rets) {

		cl->status = rets;

		list_move_tail(&cb->list, &cmpl_list->list);

		return rets;

	}

	if (rets)

		goto err;



	cl->status = 0;

	cl->writing_state = MEI_WRITING;
@@ -1587,14 +1584,21 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb, 
	cb->completed = mei_hdr.msg_complete == 1;



	if (first_chunk) {

		if (mei_cl_tx_flow_ctrl_creds_reduce(cl))

			return -EIO;

		if (mei_cl_tx_flow_ctrl_creds_reduce(cl)) {

			rets = -EIO;

			goto err;

		}

	}



	if (mei_hdr.msg_complete)

		list_move_tail(&cb->list, &dev->write_waiting_list.list);



	return 0;



err:

	cl->status = rets;

	list_move_tail(&cb->list, &cmpl_list->list);

	return rets;

}



/**

drivers/nvmem/core.c

+2 −2
Original line number Diff line number Diff line
@@ -981,8 +981,8 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem, 
 * @cell: nvmem cell to be read.

 * @len: pointer to length of cell which will be populated on successful read.

 *

 * Return: ERR_PTR() on error or a valid pointer to a char * buffer on success.

 * The buffer should be freed by the consumer with a kfree().

 * Return: ERR_PTR() on error or a valid pointer to a buffer on success. The

 * buffer should be freed by the consumer with a kfree().

 */

void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)

{

drivers/nvmem/imx-ocotp.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static struct nvmem_config imx_ocotp_nvmem_config = { 


static const struct of_device_id imx_ocotp_dt_ids[] = {

	{ .compatible = "fsl,imx6q-ocotp",  (void *)128 },

	{ .compatible = "fsl,imx6sl-ocotp", (void *)32 },

	{ .compatible = "fsl,imx6sl-ocotp", (void *)64 },

	{ .compatible = "fsl,imx6sx-ocotp", (void *)128 },

	{ },

};