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

Commit 96f18cb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-5.0-rc4' 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 5.0-rc4.

  They resolve some reported bugs and add a new device id for one
  driver. Nothing major at all, but all good to have.

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

* tag 'staging-5.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: android: ion: Support cpu access during dma_buf_detach
  staging: rtl8723bs: Fix build error with Clang when inlining is disabled
  staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
  staging: vchiq: Fix local event signalling
  Staging: wilc1000: unlock on error in init_chip()
  staging: wilc1000: fix memory leak in wilc_add_rx_gtk
  staging: wilc1000: fix registration frame size
parents 473721f9 31eb79db

drivers/staging/android/ion/ion.c

+1 −1
Original line number Diff line number Diff line
@@ -248,10 +248,10 @@ static void ion_dma_buf_detatch(struct dma_buf *dmabuf, 
	struct ion_dma_buf_attachment *a = attachment->priv;

	struct ion_buffer *buffer = dmabuf->priv;



	free_duped_table(a->table);

	mutex_lock(&buffer->lock);

	list_del(&a->list);

	mutex_unlock(&buffer->lock);

	free_duped_table(a->table);



	kfree(a);

}

drivers/staging/rtl8188eu/os_dep/usb_intf.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ static const struct usb_device_id rtw_usb_id_tbl[] = { 
	{USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */

	{USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */

	{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(0x0df6, 0x0076)}, /* Sitecom N150 v2 */

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

drivers/staging/rtl8723bs/include/ieee80211.h

+3 −3
Original line number Diff line number Diff line
@@ -850,18 +850,18 @@ enum ieee80211_state { 
#define IP_FMT "%pI4"

#define IP_ARG(x) (x)



extern __inline int is_multicast_mac_addr(const u8 *addr)

static inline int is_multicast_mac_addr(const u8 *addr)

{

        return ((addr[0] != 0xff) && (0x01 & addr[0]));

}



extern __inline int is_broadcast_mac_addr(const u8 *addr)

static inline int is_broadcast_mac_addr(const u8 *addr)

{

	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \

		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));

}



extern __inline int is_zero_mac_addr(const u8 *addr)

static inline int is_zero_mac_addr(const u8 *addr)

{

	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \

		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ remote_event_wait(wait_queue_head_t *wq, struct remote_event *event) 
static inline void

remote_event_signal_local(wait_queue_head_t *wq, struct remote_event *event)

{

	event->fired = 1;

	event->armed = 0;

	wake_up_all(wq);

}

drivers/staging/wilc1000/host_interface.c

+2 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct wilc_op_mode { 
struct wilc_reg_frame {

	bool reg;

	u8 reg_id;

	__le32 frame_type;

	__le16 frame_type;

} __packed;



struct wilc_drv_handler {
@@ -1744,7 +1744,6 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, 
		result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list,

					      ARRAY_SIZE(wid_list),

					      wilc_get_vif_idx(vif));

		kfree(gtk_key);

	} else if (mode == WILC_STATION_MODE) {

		struct wid wid;
@@ -1754,9 +1753,9 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, 
		wid.val = (u8 *)gtk_key;

		result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,

					      wilc_get_vif_idx(vif));

		kfree(gtk_key);

	}



	kfree(gtk_key);

	return result;

}