summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Chen2012-04-12 14:48:34 +0200
committerKalle Valo2012-04-16 08:12:21 +0200
commit08c6100967103a26f4cf58b404205747733a8018 (patch)
tree8928986fddeeaa52324a010384d3267a1978523a
parentath6kl: merge split format strings into one (diff)
downloadkernel-qcow2-linux-08c6100967103a26f4cf58b404205747733a8018.tar.gz
kernel-qcow2-linux-08c6100967103a26f4cf58b404205747733a8018.tar.xz
kernel-qcow2-linux-08c6100967103a26f4cf58b404205747733a8018.zip
ath6kl: Fix system crash sometimes for USB hotplug
System crash because of NULL pointer reference due to cleanup_scatter is not implemented for USB. Signed-off-by: Ray Chen <raychen@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/usb.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c
index 73aacdd047ca..dfbbe9e7ff75 100644
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
@@ -1037,6 +1037,14 @@ static void ath6kl_usb_stop(struct ath6kl *ar)
hif_stop(ar);
}
+static void ath6kl_usb_cleanup_scatter(struct ath6kl *ar)
+{
+ /*
+ * USB doesn't support it. Just return.
+ */
+ return;
+}
+
static const struct ath6kl_hif_ops ath6kl_usb_ops = {
.diag_read32 = ath6kl_usb_diag_read32,
.diag_write32 = ath6kl_usb_diag_write32,
@@ -1049,6 +1057,7 @@ static const struct ath6kl_hif_ops ath6kl_usb_ops = {
.pipe_get_default = ath6kl_usb_get_default_pipe,
.pipe_map_service = ath6kl_usb_map_service_pipe,
.pipe_get_free_queue_number = ath6kl_usb_get_free_queue_number,
+ .cleanup_scatter = ath6kl_usb_cleanup_scatter,
};
/* ath6kl usb driver registered functions */