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

Commit 31795c40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging fixes from Greg KH:
 "Here are some staging driver fixes, MAINTAINER updates, and a new
  device id.  All of these have been in the linux-next tree, and are
  pretty simple patches"

* tag 'staging-3.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8188eu: Add new device ID
  staging: imx-drm: Fix probe failure
  staging: vt6656: [BUG] iwctl_siwencodeext return if device not open
  staging: vt6656: [BUG] main_usb.c oops on device_close move flag earlier.
  staging: vt6656: rxtx.c [BUG] s_vGetFreeContext dead lock on null apTD.
  Staging: rtl8192u: r819xU_cmdpkt: checking NULL value after doing dev_alloc_skb
  staging: usbip: Orphan usbip
  staging: r8188eu: Add files for new drive: Cocci spatch "noderef"
  staging: r8188eu: Cocci spatch "noderef"
  staging: octeon-usb: Cocci spatch "noderef"
  staging: r8188eu: Add files for new drive: Cocci spatch "noderef"
  MAINTAINERS: staging: dgnc and dgap drivers: add maintainer
  staging: lustre: Cocci spatch "noderef"
parents 434ac47d df3f4edc

MAINTAINERS

+13 −2
Original line number Diff line number Diff line
@@ -2640,6 +2640,18 @@ F: include/linux/device-mapper.h 
F:	include/linux/dm-*.h

F:	include/uapi/linux/dm-*.h



DIGI NEO AND CLASSIC PCI PRODUCTS

M:	Lidza Louina <lidza.louina@gmail.com>

L:	driverdev-devel@linuxdriverproject.org

S:	Maintained

F:	drivers/staging/dgnc/



DIGI EPCA PCI PRODUCTS

M:	Lidza Louina <lidza.louina@gmail.com>

L:	driverdev-devel@linuxdriverproject.org

S:	Maintained

F:	drivers/staging/dgap/



DIOLAN U2C-12 I2C DRIVER

M:	Guenter Roeck <linux@roeck-us.net>

L:	linux-i2c@vger.kernel.org
@@ -8725,9 +8737,8 @@ F: Documentation/hid/hiddev.txt 
F:	drivers/hid/usbhid/



USB/IP DRIVERS

M:	Matt Mooney <mfm@muteddisk.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/staging/usbip/



USB ISP116X DRIVER

drivers/staging/imx-drm/imx-drm-core.c

+3 −8
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ struct imx_drm_device { 
	struct list_head			encoder_list;

	struct list_head			connector_list;

	struct mutex				mutex;

	int					references;

	int					pipes;

	struct drm_fbdev_cma			*fbhelper;

};
@@ -241,8 +240,6 @@ struct drm_device *imx_drm_device_get(void) 
		}

	}



	imxdrm->references++;



	return imxdrm->drm;



unwind_crtc:
@@ -280,8 +277,6 @@ void imx_drm_device_put(void) 
	list_for_each_entry(enc, &imxdrm->encoder_list, list)

		module_put(enc->owner);



	imxdrm->references--;



	mutex_unlock(&imxdrm->mutex);

}

EXPORT_SYMBOL_GPL(imx_drm_device_put);
@@ -485,7 +480,7 @@ int imx_drm_add_crtc(struct drm_crtc *crtc, 


	mutex_lock(&imxdrm->mutex);



	if (imxdrm->references) {

	if (imxdrm->drm->open_count) {

		ret = -EBUSY;

		goto err_busy;

	}
@@ -564,7 +559,7 @@ int imx_drm_add_encoder(struct drm_encoder *encoder, 


	mutex_lock(&imxdrm->mutex);



	if (imxdrm->references) {

	if (imxdrm->drm->open_count) {

		ret = -EBUSY;

		goto err_busy;

	}
@@ -709,7 +704,7 @@ int imx_drm_add_connector(struct drm_connector *connector, 


	mutex_lock(&imxdrm->mutex);



	if (imxdrm->references) {

	if (imxdrm->drm->open_count) {

		ret = -EBUSY;

		goto err_busy;

	}

drivers/staging/lustre/lustre/obdecho/echo_client.c

+1 −1
Original line number Diff line number Diff line
@@ -1387,7 +1387,7 @@ echo_copyout_lsm (struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob) 
	if (nob > ulsm_nob)

		return (-EINVAL);



	if (copy_to_user (ulsm, lsm, sizeof(ulsm)))

	if (copy_to_user (ulsm, lsm, sizeof(*ulsm)))

		return (-EFAULT);



	for (i = 0; i < lsm->lsm_stripe_count; i++) {

drivers/staging/octeon-usb/cvmx-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ int cvmx_usb_initialize(struct cvmx_usb_state *state, int usb_port_number, 
			}

	}



	memset(usb, 0, sizeof(usb));

	memset(usb, 0, sizeof(*usb));

	usb->init_flags = flags;



	/* Initialize the USB state structure */

drivers/staging/rtl8188eu/core/rtw_mp.c

+1 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ u32 mp_query_psd(struct adapter *pAdapter, u8 *data) 
		sscanf(data, "pts =%d, start =%d, stop =%d", &psd_pts, &psd_start, &psd_stop);

	}



	_rtw_memset(data, '\0', sizeof(data));

	_rtw_memset(data, '\0', sizeof(*data));



	i = psd_start;

	while (i < psd_stop) {