Commit 7da37cd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging fixes from Greg KH:
 "Here are some small staging driver fixes for 5.5-rc6.

  Nothing major here, just some small fixes for a comedi driver, the
  vt6656 driver, and a new device id for the rtl8188eu driver.

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

* tag 'staging-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8188eu: Add device code for TP-Link TL-WN727N v5.21
  staging: comedi: adv_pci1710: fix AI channels 16-31 for PCI-1713
  staging: vt6656: set usb_set_intfdata on driver fail.
  staging: vt6656: remove bool from vnt_radio_power_on ret
  staging: vt6656: limit reg output to block size
  staging: vt6656: correct return of vnt_init_registers.
  staging: vt6656: Fix non zero logical return of, usb_control_msg
parents 5a96c0bb 58dcc5bf

drivers/staging/comedi/drivers/adv_pci1710.c

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ 
#define PCI171X_RANGE_UNI	BIT(4)

#define PCI171X_RANGE_GAIN(x)	(((x) & 0x7) << 0)

#define PCI171X_MUX_REG		0x04	/* W:   A/D multiplexor control */

#define PCI171X_MUX_CHANH(x)	(((x) & 0xf) << 8)

#define PCI171X_MUX_CHANL(x)	(((x) & 0xf) << 0)

#define PCI171X_MUX_CHANH(x)	(((x) & 0xff) << 8)

#define PCI171X_MUX_CHANL(x)	(((x) & 0xff) << 0)

#define PCI171X_MUX_CHAN(x)	(PCI171X_MUX_CHANH(x) | PCI171X_MUX_CHANL(x))

#define PCI171X_STATUS_REG	0x06	/* R:   status register */

#define PCI171X_STATUS_IRQ	BIT(11)	/* 1=IRQ occurred */

drivers/staging/rtl8188eu/os_dep/usb_intf.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static const struct usb_device_id rtw_usb_id_tbl[] = { 
	{USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */

	{USB_DEVICE(0x2001, 0x331B)}, /* D-Link DWA-121 rev B1 */

	{USB_DEVICE(0x2357, 0x010c)}, /* TP-Link TL-WN722N v2 */

	{USB_DEVICE(0x2357, 0x0111)}, /* TP-Link TL-WN727N v5.21 */

	{USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */

	{USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill RNX-N150NUB */

	{}	/* Terminating entry */

drivers/staging/vt6656/baseband.c

+2 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ int vnt_vt3184_init(struct vnt_private *priv) 


	memcpy(array, addr, length);



	ret = vnt_control_out(priv, MESSAGE_TYPE_WRITE, 0,

	ret = vnt_control_out_blocks(priv, VNT_REG_BLOCK_SIZE,

				     MESSAGE_REQUEST_BBREG, length, array);

	if (ret)

		goto end;

drivers/staging/vt6656/card.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ end: 
 */

int vnt_radio_power_on(struct vnt_private *priv)

{

	int ret = true;

	int ret = 0;



	vnt_exit_deep_sleep(priv);

drivers/staging/vt6656/device.h

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ struct vnt_private { 
	u8 mac_hw;

	/* netdev */

	struct usb_device *usb;

	struct usb_interface *intf;



	u64 tsf_time;

	u8 rx_rate;

CRA Git | Maintained and supported by SUSTech CRA and CCSE