> -----Original Message----- > From: kvalo=codeaurora.org@xxxxxxxxxxxxxxxxx [mailto:kvalo=codeaurora.org@xxxxxxxxxxxxxxxxx] On > Behalf Of Kalle Valo > Sent: Thursday, June 24, 2021 1:47 AM > To: Pkshih > Cc: tony0620emma@xxxxxxxxx; linux-wireless@xxxxxxxxxxxxxxx; Bernie Huang > Subject: Re: [PATCH] rtw88: fix c2h memory leak > > Ping-Ke Shih <pkshih@xxxxxxxxxxx> wrote: > > > From: Po-Hao Huang <phhuang@xxxxxxxxxxx> > > > > Fix erroneous code that leads to unreferenced objects. During H2C > > operations, some functions returned without freeing the memory that only > > the function have access to. Release these objects when they're no longer > > needed to avoid potentially memory leaks. > > > > Signed-off-by: Po-Hao Huang <phhuang@xxxxxxxxxxx> > > Signed-off-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx> > > Failed to apply, please rebase: > > Recorded preimage for 'drivers/net/wireless/realtek/rtw88/coex.c' > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Applying: rtw88: fix c2h memory leak > Using index info to reconstruct a base tree... > M drivers/net/wireless/realtek/rtw88/coex.c > M drivers/net/wireless/realtek/rtw88/fw.c > M drivers/net/wireless/realtek/rtw88/main.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/net/wireless/realtek/rtw88/main.c > Auto-merging drivers/net/wireless/realtek/rtw88/fw.c > Auto-merging drivers/net/wireless/realtek/rtw88/coex.c > CONFLICT (content): Merge conflict in drivers/net/wireless/realtek/rtw88/coex.c > Patch failed at 0001 rtw88: fix c2h memory leak > > Patch set to Changes Requested. > v2 is sent. Thank you -- Ping-Ke
