pentoo-overlay/sys-kernel/compat-drivers/files/compat-drivers-3.8-ath6kl.patch

37 lines
1.4 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

Fixes for:
drivers/net/wireless/ath/ath6kl/sdio.c: In function ath6kl_sdio_alloc_prep_scat_req:
drivers/net/wireless/ath/ath6kl/sdio.c:1478:1: warning: find_arg_number: cannot find the buf_sz argument in ath6kl_sdio_alloc_prep_scat_req [enabled by default]
drivers/net/wireless/ath/ath6kl/sdio.c:1478:1: warning: find_arg_number: cannot find the sg_sz argument in ath6kl_sdio_alloc_prep_scat_req [enabled by default]
--- ./drivers/net/wireless/ath/ath6kl/sdio.c
+++ ./drivers/net/wireless/ath/ath6kl/sdio.c
@@ -341,11 +341,14 @@
scat_list_sz = (n_scat_entry - 1) * sizeof(struct hif_scatter_item);
scat_req_sz = sizeof(*s_req) + scat_list_sz;
- if (!virt_scat)
- sg_sz = sizeof(struct scatterlist) * n_scat_entry;
- else
- buf_sz = 2 * L1_CACHE_BYTES +
- ATH6KL_MAX_TRANSFER_SIZE_PER_SCATTER;
+ if (!virt_scat) {
+ sg_sz = sizeof(struct scatterlist) * n_scat_entry;
+ buf_sz = 0;
+ } else {
+ sg_sz = 0;
+ buf_sz = 2 * L1_CACHE_BYTES +
+ ATH6KL_MAX_TRANSFER_SIZE_PER_SCATTER;
+ }
for (i = 0; i < n_scat_req; i++) {
/* allocate the scatter request */
--- ./drivers/gpu/drm/i915/intel_display.c
+++ ./drivers/gpu/drm/i915/intel_display.c
@@ -7110,7 +7110,7 @@
obj = work->old_fb_obj;
atomic_clear_mask(1 << intel_crtc->plane,
- &obj->pending_flip.counter);
+ &obj->pending_flip);
wake_up(&dev_priv->pending_flip_queue);
queue_work(dev_priv->wq, &work->work);