tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 96f18cb8 473721f9

+12 -10
+1 -1
drivers/staging/android/ion/ion.c
··· 248 248 struct ion_dma_buf_attachment *a = attachment->priv; 249 249 struct ion_buffer *buffer = dmabuf->priv; 250 250 251 - free_duped_table(a->table); 252 251 mutex_lock(&buffer->lock); 253 252 list_del(&a->list); 254 253 mutex_unlock(&buffer->lock); 254 + free_duped_table(a->table); 255 255 256 256 kfree(a); 257 257 }
+1
drivers/staging/rtl8188eu/os_dep/usb_intf.c
··· 35 35 {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */ 36 36 {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */ 37 37 {USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */ 38 + {USB_DEVICE(0x2001, 0x331B)}, /* D-Link DWA-121 rev B1 */ 38 39 {USB_DEVICE(0x2357, 0x010c)}, /* TP-Link TL-WN722N v2 */ 39 40 {USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */ 40 41 {USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill RNX-N150NUB */
+3 -3
drivers/staging/rtl8723bs/include/ieee80211.h
··· 850 850 #define IP_FMT "%pI4" 851 851 #define IP_ARG(x) (x) 852 852 853 - extern __inline int is_multicast_mac_addr(const u8 *addr) 853 + static inline int is_multicast_mac_addr(const u8 *addr) 854 854 { 855 855 return ((addr[0] != 0xff) && (0x01 & addr[0])); 856 856 } 857 857 858 - extern __inline int is_broadcast_mac_addr(const u8 *addr) 858 + static inline int is_broadcast_mac_addr(const u8 *addr) 859 859 { 860 860 return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ 861 861 (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); 862 862 } 863 863 864 - extern __inline int is_zero_mac_addr(const u8 *addr) 864 + static inline int is_zero_mac_addr(const u8 *addr) 865 865 { 866 866 return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ 867 867 (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
+1
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
··· 446 446 static inline void 447 447 remote_event_signal_local(wait_queue_head_t *wq, struct remote_event *event) 448 448 { 449 + event->fired = 1; 449 450 event->armed = 0; 450 451 wake_up_all(wq); 451 452 }
+2 -3
drivers/staging/wilc1000/host_interface.c
··· 36 36 struct wilc_reg_frame { 37 37 bool reg; 38 38 u8 reg_id; 39 - __le32 frame_type; 39 + __le16 frame_type; 40 40 } __packed; 41 41 42 42 struct wilc_drv_handler { ··· 1744 1744 result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, 1745 1745 ARRAY_SIZE(wid_list), 1746 1746 wilc_get_vif_idx(vif)); 1747 - kfree(gtk_key); 1748 1747 } else if (mode == WILC_STATION_MODE) { 1749 1748 struct wid wid; 1750 1749 ··· 1753 1754 wid.val = (u8 *)gtk_key; 1754 1755 result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, 1755 1756 wilc_get_vif_idx(vif)); 1756 - kfree(gtk_key); 1757 1757 } 1758 1758 1759 + kfree(gtk_key); 1759 1760 return result; 1760 1761 } 1761 1762
+4 -3
drivers/staging/wilc1000/wilc_wlan.c
··· 1252 1252 ret = wilc->hif_func->hif_read_reg(wilc, 0x1118, &reg); 1253 1253 if (!ret) { 1254 1254 netdev_err(dev, "fail read reg 0x1118\n"); 1255 - return ret; 1255 + goto release; 1256 1256 } 1257 1257 reg |= BIT(0); 1258 1258 ret = wilc->hif_func->hif_write_reg(wilc, 0x1118, reg); 1259 1259 if (!ret) { 1260 1260 netdev_err(dev, "fail write reg 0x1118\n"); 1261 - return ret; 1261 + goto release; 1262 1262 } 1263 1263 ret = wilc->hif_func->hif_write_reg(wilc, 0xc0000, 0x71); 1264 1264 if (!ret) { 1265 1265 netdev_err(dev, "fail write reg 0xc0000\n"); 1266 - return ret; 1266 + goto release; 1267 1267 } 1268 1268 } 1269 1269 1270 + release: 1270 1271 release_bus(wilc, WILC_BUS_RELEASE_ONLY); 1271 1272 1272 1273 return ret;