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

Merge tag 'staging-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver fixes from Greg KH:
 "Here are some small staging driver fixes for reported issues for
  4.13-rc2.

  Also in here is a new driver, the virtualbox DRM driver. It's
  stand-alone and got acks from the DRM developers to go in through this
  tree. It's a new thing, but it should be fine for this point in the rc
  cycle due to it being independent.

  All of this has been in linux-next for a while with no reported
  issues"

* tag 'staging-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8188eu: add TL-WN722N v2 support
  staging: speakup: safely register and unregister ldisc
  staging: speakup: add functions to register and unregister ldisc
  staging: speakup: safely close tty
  staging: sm750fb: avoid conflicting vesafb
  staging: lustre: ko2iblnd: check copy_from_iter/copy_to_iter return code
  staging: vboxvideo: Add vboxvideo to drivers/staging
  staging: sm750fb: fixed a assignment typo
  staging: rtl8188eu: memory leak in rtw_free_cmd_obj()
  staging: vchiq_arm: fix error codes in probe
  staging: comedi: ni_mio_common: fix AO timer off-by-one regression
parents 82abbea7 5a1d4c5d

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -110,4 +110,6 @@ source "drivers/staging/ccree/Kconfig" 


source "drivers/staging/typec/Kconfig"



source "drivers/staging/vboxvideo/Kconfig"



endif # STAGING

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -44,3 +44,4 @@ obj-$(CONFIG_KS7010) += ks7010/ 
obj-$(CONFIG_GREYBUS)		+= greybus/

obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/

obj-$(CONFIG_CRYPTO_DEV_CCREE)	+= ccree/

obj-$(CONFIG_DRM_VBOXVIDEO)	+= vboxvideo/

drivers/staging/comedi/drivers/ni_mio_common.c

+1 −2
Original line number Diff line number Diff line
@@ -3116,8 +3116,7 @@ static void ni_ao_cmd_set_update(struct comedi_device *dev, 
		/* following line: 2-1 per STC */

		ni_stc_writel(dev, 1, NISTC_AO_UI_LOADA_REG);

		ni_stc_writew(dev, NISTC_AO_CMD1_UI_LOAD, NISTC_AO_CMD1_REG);

		/* following line: N-1 per STC */

		ni_stc_writel(dev, trigvar - 1, NISTC_AO_UI_LOADA_REG);

		ni_stc_writel(dev, trigvar, NISTC_AO_UI_LOADA_REG);

	} else { /* TRIG_EXT */

		/* FIXME:  assert scan_begin_arg != 0, ret failure otherwise */

		devpriv->ao_cmd2  |= NISTC_AO_CMD2_BC_GATE_ENA;

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+15 −4
Original line number Diff line number Diff line
@@ -1640,8 +1640,13 @@ kiblnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg) 
	ibmsg = tx->tx_msg;

	ibmsg->ibm_u.immediate.ibim_hdr = *hdr;



	copy_from_iter(&ibmsg->ibm_u.immediate.ibim_payload, IBLND_MSG_SIZE,

	rc = copy_from_iter(&ibmsg->ibm_u.immediate.ibim_payload, payload_nob,

			    &from);

	if (rc != payload_nob) {

		kiblnd_pool_free_node(&tx->tx_pool->tpo_pool, &tx->tx_list);

		return -EFAULT;

	}



	nob = offsetof(struct kib_immediate_msg, ibim_payload[payload_nob]);

	kiblnd_init_tx_msg(ni, tx, IBLND_MSG_IMMEDIATE, nob);
@@ -1741,8 +1746,14 @@ kiblnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg, 
			break;

		}



		copy_to_iter(&rxmsg->ibm_u.immediate.ibim_payload,

			     IBLND_MSG_SIZE, to);

		rc = copy_to_iter(&rxmsg->ibm_u.immediate.ibim_payload, rlen,

				  to);

		if (rc != rlen) {

			rc = -EFAULT;

			break;

		}



		rc = 0;

		lnet_finalize(ni, lntmsg, 0);

		break;

drivers/staging/rtl8188eu/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd) 
		kfree(pcmd->parmbuf);

	}



	if (!pcmd->rsp) {

	if (pcmd->rsp) {

		if (pcmd->rspsz != 0) {

			/* free rsp in cmd_obj */

			kfree(pcmd->rsp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE