Skip to content

Commit 0d50658

Browse files
committed
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
2 parents 87a7f73 + e9de1ec commit 0d50658

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0+
22
/*
3-
* Copyright (C) 2013, Lars-Peter Clausen <[email protected]>
43
* GDMA4740 DMAC support
54
*/
65

@@ -914,6 +913,5 @@ static struct platform_driver gdma_dma_driver = {
914913
};
915914
module_platform_driver(gdma_dma_driver);
916915

917-
MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
918916
MODULE_DESCRIPTION("Ralink/MTK DMA driver");
919917
MODULE_LICENSE("GPL v2");

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2091,7 +2091,7 @@ void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame,
20912091
struct net_device *ndev = padapter->pnetdev;
20922092

20932093
{
2094-
struct station_info sinfo;
2094+
struct station_info sinfo = {};
20952095
u8 ie_offset;
20962096
if (GetFrameSubType(pmgmt_frame) == WIFI_ASSOCREQ)
20972097
ie_offset = _ASOCREQ_IE_OFFSET_;

0 commit comments

Comments
 (0)