Commit 0d506588 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg KH:
 "Two tiny staging driver fixes:

   - ralink-gdma driver authorship information fixed up

   - rtl8723bs driver fix for reported regression

  Both have been in linux-next for a while with no reported problems"

* tag 'staging-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: ralink-gdma: Remove incorrect author information
  staging: rtl8723bs: Fix uninitialized variables
parents 87a7f736 e9de1eca

drivers/staging/ralink-gdma/ralink-gdma.c

+0 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 *  Copyright (C) 2013, Lars-Peter Clausen <lars@metafoo.de>

 *  GDMA4740 DMAC support

 */
@@ -914,6 +913,5 @@ static struct platform_driver gdma_dma_driver = { 
};

module_platform_driver(gdma_dma_driver);



MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");

MODULE_DESCRIPTION("Ralink/MTK DMA driver");

MODULE_LICENSE("GPL v2");

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -2091,7 +2091,7 @@ void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame, 
	struct net_device *ndev = padapter->pnetdev;



	{

		struct station_info sinfo;

		struct station_info sinfo = {};

		u8 ie_offset;

		if (GetFrameSubType(pmgmt_frame) == WIFI_ASSOCREQ)

			ie_offset = _ASOCREQ_IE_OFFSET_;