]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: beb41e9) | patch
ath10k: fix a conflict bug in wmi service bitmap
authorMichal Kazior <michal.kazior@tieto.com>
Tue, 19 Aug 2014 11:22:32 +0000 (13:22 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 25 Aug 2014 08:21:49 +0000 (11:21 +0300)
commit27ff205c11784cbaca185ce3143c47a1eb44a5c2
treea48c8a1dafca4ff9119ee141f341afd67f858e91tree | snapshot
parentbeb41e929829650808dfaf4b3cb80923fd4a719fcommit | diff
ath10k: fix a conflict bug in wmi service bitmap

Service mapping for main firmware branch was incorrectly used for 10.x firmware
and vice-versa.  This caused wmi_services in debugfs to print wrong values.

This fixes commit 5d3a0e87e9101 ("ath10k: fix wmi service bitmap debug") where
for some reason there was either a conflict that wasn't resolved properly or
git had a bad day.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath10k/wmi.c diff | blob | history
Linux Kernel Source Tree.