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

Commit 84e12d99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg KH:
 "Here are five staging driver fixes for 3.15-rc6 that resolve some
  reported issues.  They are for the imx and rtl8723au drivers"

* tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8723au: Do not reset wdev->iftype in netdev_close()
  staging: rtl8723au: Use correct pipe type for USB interrupts
  imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus'
  imx-drm: imx-drm-core: skip components whose parent device is disabled
  imx-drm: imx-drm-core: fix imx_drm_encoder_get_mux_id
parents 439c6109 bb4e5065

arch/arm/boot/dts/imx53-mba53.dts

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ 
&tve {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_vga_sync_1>;

	i2c-ddc-bus = <&i2c3>;

	ddc-i2c-bus = <&i2c3>;

	fsl,tve-mode = "vga";

	fsl,hsync-pin = <4>;

	fsl,vsync-pin = <6>;

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

+6 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node, 
		of_node_put(port);

		if (port == imx_crtc->port) {

			ret = of_graph_parse_endpoint(ep, &endpoint);

			return ret ? ret : endpoint.id;

			return ret ? ret : endpoint.port;

		}

	} while (ep);
@@ -675,6 +675,11 @@ static int imx_drm_platform_probe(struct platform_device *pdev) 
			if (!remote || !of_device_is_available(remote)) {

				of_node_put(remote);

				continue;

			} else if (!of_device_is_available(remote->parent)) {

				dev_warn(&pdev->dev, "parent device of %s is not available\n",

					 remote->full_name);

				of_node_put(remote);

				continue;

			}



			ret = imx_drm_add_component(&pdev->dev, remote);

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

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) 
	tve->dev = dev;

	spin_lock_init(&tve->lock);



	ddc_node = of_parse_phandle(np, "i2c-ddc-bus", 0);

	ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0);

	if (ddc_node) {

		tve->ddc = of_find_i2c_adapter_by_node(ddc_node);

		of_node_put(ddc_node);

drivers/staging/rtl8723au/os_dep/os_intfs.c

+0 −2
Original line number Diff line number Diff line
@@ -953,8 +953,6 @@ static int netdev_close(struct net_device *pnetdev) 
#endif /* CONFIG_8723AU_P2P */



	rtw_scan_abort23a(padapter);

	 /* set this at the end */

	padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR;



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-871x_drv - drv_close\n"));

	DBG_8723A("-871x_drv - drv_close, bup =%d\n", padapter->bup);

drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ unsigned int ffaddr2pipehdl23a(struct dvobj_priv *pdvobj, u32 addr) 
	if (addr == RECV_BULK_IN_ADDR) {

		pipe = usb_rcvbulkpipe(pusbd, pdvobj->RtInPipe[0]);

	} else if (addr == RECV_INT_IN_ADDR) {

		pipe = usb_rcvbulkpipe(pusbd, pdvobj->RtInPipe[1]);

		pipe = usb_rcvintpipe(pusbd, pdvobj->RtInPipe[1]);

	} else if (addr < HW_QUEUE_ENTRY) {

		ep_num = pdvobj->Queue2Pipe[addr];

		pipe = usb_sndbulkpipe(pusbd, ep_num);