This is a note to let you know that I've just added the patch titled
[PATCH] Revert "usb: gadget: composite: always set ep->mult to a
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-usb-gadget-composite-always-set-ep-mult-to-a.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2f17bb4d410e1d7203f9d1782e2263a46ccf7379 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 12 Jan 2017 08:51:32 +0100
Subject: [PATCH] Revert "usb: gadget: composite: always set ep->mult to a
sensible value"
This reverts commit eab1c4e2d0ad4509ccb8476a604074547dc202e0 which is
commit eaa496ffaaf19591fe471a36cef366146eeb9153 upstream as it was
incorrectly backported.
Reported-by: Bin Liu <b-liu@xxxxxx>
Cc: Felipe Balbi <balbi@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/gadget/composite.c | 9 ++-------
drivers/usb/gadget/function/uvc_video.c | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -201,12 +201,7 @@ ep_found:
_ep->desc = chosen_desc;
_ep->comp_desc = NULL;
_ep->maxburst = 0;
- _ep->mult = 1;
-
- if (g->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(_ep->desc) ||
- usb_endpoint_xfer_int(_ep->desc)))
- _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
-
+ _ep->mult = 0;
if (!want_comp_desc)
return 0;
@@ -223,7 +218,7 @@ ep_found:
switch (usb_endpoint_type(_ep->desc)) {
case USB_ENDPOINT_XFER_ISOC:
/* mult: bits 1:0 of bmAttributes */
- _ep->mult = (comp_desc->bmAttributes & 0x3) + 1;
+ _ep->mult = comp_desc->bmAttributes & 0x3;
case USB_ENDPOINT_XFER_BULK:
case USB_ENDPOINT_XFER_INT:
_ep->maxburst = comp_desc->bMaxBurst + 1;
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -243,7 +243,7 @@ uvc_video_alloc_requests(struct uvc_vide
req_size = video->ep->maxpacket
* max_t(unsigned int, video->ep->maxburst, 1)
- * (video->ep->mult);
+ * (video->ep->mult + 1);
for (i = 0; i < UVC_NUM_REQUESTS; ++i) {
video->req_buffer[i] = kmalloc(req_size, GFP_KERNEL);
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-4.9/kvm-mips-don-t-clobber-cp0_status.ux.patch
queue-4.9/usb-gadget-fix-request-length-error-for-isoc-transfer.patch
queue-4.9/staging-media-davinci_vpfe-unlock-on-error-in-vpfe_reqbufs.patch
queue-4.9/kvm-mips-flush-kvm-entry-code-from-icache-globally.patch
queue-4.9/hwmon-ds620-fix-overflows-seen-when-writing-temperature-limits.patch
queue-4.9/platform-x86-fujitsu-laptop-use-brightness_set_blocking-for-led-setting-callbacks.patch
queue-4.9/parisc-mark-cr16-clocksource-unstable-on-smp-systems.patch
queue-4.9/mei-bus-fix-mei_cldev_enable-kdoc.patch
queue-4.9/xfs-always-succeed-when-deduping-zero-bytes.patch
queue-4.9/ima-fix-memory-leak-in-ima_release_policy.patch
queue-4.9/usb-dummy-hcd-fix-bug-in-stop_activity-handle-ep0.patch
queue-4.9/xfs-fix-crash-and-data-corruption-due-to-removal-of-busy-cow-extents.patch
queue-4.9/revert-rtlwifi-fix-enter-exit-power_save.patch
queue-4.9/pci-convert-broken-intx-masking-quirks-from-header-to-final.patch
queue-4.9/usb-host-xhci-fix-possible-wild-pointer-when-handling-abort-command.patch
queue-4.9/clk-renesas-cpg-mssr-fix-inverted-debug-check.patch
queue-4.9/usb-serial-io_ti-fix-i-o-after-disconnect.patch
queue-4.9/usb-hub-move-hub_port_disable-to-fix-warning-if-pm-is-disabled.patch
queue-4.9/nl80211-use-different-attrs-for-bssid-and-random-mac-addr-in-scan-req.patch
queue-4.9/usb-dwc3-core-avoid-overflow-events.patch
queue-4.9/arm-dts-sun7i-bananapi-m1-plus-enable-usb-phy-for-usb-host-support.patch
queue-4.9/asoc-samsung-i2s-fixup-last-irq-unsafe-spin-lock-call.patch
queue-4.9/xfs-don-t-allow-di_size-with-high-bit-set.patch
queue-4.9/xfs-new-inode-extent-list-lookup-helpers.patch
queue-4.9/xfs-don-t-call-xfs_sb_quota_from_disk-twice.patch
queue-4.9/usb-gadgetfs-fix-use-after-free-bug.patch
queue-4.9/s390-topology-always-use-s390-specific-sched_domain_topology_level.patch
queue-4.9/alsa-hda-fix-up-gpio-for-asus-rog-ranger.patch
queue-4.9/xfs-factor-rmap-btree-size-into-the-indlen-calculations.patch
queue-4.9/xfs-check-return-value-of-_trans_reserve_quota_nblks.patch
queue-4.9/asoc-lpass-platform-initialize-dma-channel-number.patch
queue-4.9/crypto-arm64-aes-neon-fix-for-big-endian.patch
queue-4.9/usb-musb-blackfin-add-bfin_fifo_offset-in-bfin_ops.patch
queue-4.9/xfs-complain-if-we-don-t-get-nextents-bmap-records.patch
queue-4.9/drm-i915-fix-oopses-in-the-overlay-code-due-to-i915_gem_active-stuff.patch
queue-4.9/usb-musb-dsps-implement-clear_ep_rxintr-callback.patch
queue-4.9/hwmon-lm90-fix-temp1_max_alarm-attribute.patch
queue-4.9/alsa-hda-apply-asus-mode8-fixup-to-asus-x71sl.patch
queue-4.9/pci-convert-mellanox-broken-intx-quirks-to-be-for-listed-devices-only.patch
queue-4.9/usb-dwc3-pci-fix-dr_mode-misspelling.patch
queue-4.9/usb-serial-ti_usb_3410_5052-fix-null-deref-at-open.patch
queue-4.9/hwmon-amc6821-sign-extension-temperature.patch
queue-4.9/mac80211-fix-tid_agg_rx-null-dereference.patch
queue-4.9/iio-max44000-correct-value-in-illuminance_integration_time_available.patch
queue-4.9/clocksource-dummy_timer-move-hotplug-callback-after-the-real-timers.patch
queue-4.9/ath10k-fix-failure-to-send-null-func-frame-for-10.4.patch
queue-4.9/clk-qcom-ipq806x-fix-board-clk-rates.patch
queue-4.9/mmc-mmc_test-uninitialized-return-value.patch
queue-4.9/pm-wakeirq-fix-dedicated-wakeirq-for-drivers-not-using-autosuspend.patch
queue-4.9/usb-gadget-composite-test-get_alt-presence-instead-of-set_alt.patch
queue-4.9/xfs-check-for-bogus-values-in-btree-block-headers.patch
queue-4.9/xfs-use-gpf_nofs-when-allocating-btree-cursors.patch
queue-4.9/usb-serial-kl5kusb105-abort-on-open-exception-path.patch
queue-4.9/xhci-handle-command-completion-and-timeout-race.patch
queue-4.9/hid-sensor-hub-move-the-memset-to-sensor_hub_get_feature.patch
queue-4.9/xhci-use-delayed_work-instead-of-timer-for-command-timeout.patch
queue-4.9/asoc-cht_bsw_rt5645-fix-leftover-kmalloc.patch
queue-4.9/usb-serial-kobil_sct-fix-null-deref-in-write.patch
queue-4.9/xfs-fix-max_retries-_show-and-_store-functions.patch
queue-4.9/usb-serial-spcp8x5-fix-null-deref-at-open.patch
queue-4.9/crypto-arm64-ghash-ce-fix-for-big-endian.patch
queue-4.9/scsi-mvsas-fix-command_active-typo.patch
queue-4.9/usb-serial-mos7720-fix-parallel-probe.patch
queue-4.9/sbp-target-fix-second-argument-of-percpu_ida_alloc.patch
queue-4.9/usb-xhci-fix-possible-wild-pointer.patch
queue-4.9/drm-i915-tune-down-the-fast-link-training-vs-boot-fail.patch
queue-4.9/crypto-arm64-aes-ce-fix-for-big-endian.patch
queue-4.9/drm-i915-initialize-overlay-last_flip-properly.patch
queue-4.9/md-fix-refcount-problem-on-mddev-when-stopping-array.patch
queue-4.9/pci-rockchip-correct-the-use-of-fts-mask.patch
queue-4.9/xfs-fix-double-cleanup-when-cui-recovery-fails.patch
queue-4.9/pci-enable-access-to-non-standard-vpd-for-chelsio-devices-cxgb3.patch
queue-4.9/irqchip-bcm7038-l1-implement-irq_cpu_offline-callback.patch
queue-4.9/alsa-usb-audio-fix-bogus-error-return-in-snd_usb_create_stream.patch
queue-4.9/xhci-free-xhci-virtual-devices-with-leaf-nodes-first.patch
queue-4.9/iommu-vt-d-fix-pasid-table-size-encoding.patch
queue-4.9/xfs-don-t-skip-cow-forks-w-delalloc-blocks-in-cowblocks-scan.patch
queue-4.9/relay-check-array-offset-before-using-it.patch
queue-4.9/usb-dwc3-ep0-explicitly-call-dwc3_ep0_prepare_one_trb.patch
queue-4.9/clk-clk-wm831x-fix-a-logic-error.patch
queue-4.9/xfs-track-preallocation-separately-in-xfs_bmapi_reserve_delalloc.patch
queue-4.9/usb-phy-am335x-control-fix-device-and-of_node-leaks.patch
queue-4.9/usb-serial-io_ti-bind-to-interface-after-fw-download.patch
queue-4.9/drm-radeon-always-store-crtc-relative-radeon_crtc-cursor_x-y-values.patch
queue-4.9/usb-serial-cyberjack-fix-null-deref-at-open.patch
queue-4.9/usb-serial-mos7720-fix-null-deref-at-open.patch
queue-4.9/docs-rst-fix-latex-durole-renewcommand-with-sphinx-1.3.patch
queue-4.9/clk-renesas-mstp-support-8-bit-registers-for-r7s72100.patch
queue-4.9/crypto-arm64-aes-xts-ce-fix-for-big-endian.patch
queue-4.9/pci-add-mellanox-device-ids.patch
queue-4.9/drm-i915-gen9-fix-the-wm-memory-bandwidth-wa-for-y-tiling-cases.patch
queue-4.9/xfs-use-the-actual-ag-length-when-reserving-blocks.patch
queue-4.9/usb-serial-garmin_gps-fix-memory-leak-on-failed-urb-submit.patch
queue-4.9/usb-return-error-code-when-platform_get_irq-fails.patch
queue-4.9/s390-pci-fix-dma-address-calculation-in-map_sg.patch
queue-4.9/drm-i915-force-vdd-off-on-the-new-power-seqeuencer-before-starting-to-use-it.patch
queue-4.9/usb-serial-io_ti-fix-null-deref-at-open.patch
queue-4.9/usb-gadgetfs-restrict-upper-bound-on-device-configuration-size.patch
queue-4.9/usb-gadget-udc-core-fix-return-code-of-usb_gadget_probe_driver.patch
queue-4.9/usb-gadget-fix-second-argument-of-percpu_ida_alloc.patch
queue-4.9/md-md_recovery_needed-is-set-for-mddev-recovery.patch
queue-4.9/mm-hugetlb.c-use-the-right-pte-val-for-compare-in-hugetlb_cow.patch
queue-4.9/xfs-ignore-leaf-attr-ichdr.count-in-verifier-during-log-replay.patch
queue-4.9/xfs-pass-post-eof-speculative-prealloc-blocks-to-bmapi.patch
queue-4.9/xfs-don-t-cap-maximum-dedupe-request-length.patch
queue-4.9/usb-gadgetfs-fix-checks-of-wtotallength-in-config-descriptors.patch
queue-4.9/mei-fix-parameter-rename-kdoc.patch
queue-4.9/mac80211-initialize-fast-xmit-info-later.patch
queue-4.9/clk-imx31-fix-rewritten-input-argument-of-mx31_clocks_init.patch
queue-4.9/target-iscsi-fix-double-free-in-lio_target_tiqn_addtpg.patch
queue-4.9/powerpc-pci-rpadlpar-fix-device-reference-leaks.patch
queue-4.9/xfs-pass-state-not-whichfork-to-trace_xfs_extlist.patch
queue-4.9/pci-rockchip-fix-negotiated-lanes-calculation.patch
queue-4.9/clk-ti-dra7-fix-failed-to-lookup-clock-node-gmac_gmii_ref_clk_div-boot-message.patch
queue-4.9/hwmon-scpi-fix-module-autoload.patch
queue-4.9/f2fs-remove-percpu_count-due-to-performance-regression.patch
queue-4.9/arm-davinci-da850-don-t-add-emac-clock-to-lookup-table-twice.patch
queue-4.9/usb-serial-pl2303-fix-null-deref-at-open.patch
queue-4.9/clk-sunxi-ng-sun8i-h3-set-clk_set_rate_parent-for-audio-module-clocks.patch
queue-4.9/x86-cpu-probe-cpuid-leaf-6-even-when-cpuid_level-6.patch
queue-4.9/pinctrl-amd-set-the-level-based-on-acpi-tables.patch
queue-4.9/x86-prctl-uapi-remove-ifdef-for-checkpoint_restore.patch
queue-4.9/mfd-tps65217-fix-page-fault-on-unloading-modules.patch
queue-4.9/xhci-fix-race-related-to-abort-operation.patch
queue-4.9/xfs-move-agi-buffer-type-setting-to-xfs_read_agi.patch
queue-4.9/usb-serial-quatech2-fix-sleep-while-atomic-in-close.patch
queue-4.9/mei-move-write-cb-to-completion-on-credentials-failures.patch
queue-4.9/asm-prototypes-clear-any-cpp-defines-before-declaring-the-functions.patch
queue-4.9/usb-xhci-fix-return-value-of-xhci_setup_device.patch
queue-4.9/usb-dwc3-gadget-always-unmap-ep0-requests.patch
queue-4.9/pci-support-intx-masking-on-connectx-4-with-firmware-x.14.1100.patch
queue-4.9/usb-serial-iuu_phoenix-fix-null-deref-at-open.patch
queue-4.9/usb-serial-oti6858-fix-null-deref-at-open.patch
queue-4.9/s390-crypto-unlock-on-error-in-prng_tdes_read.patch
queue-4.9/hwmon-nct7802-fix-overflows-seen-when-writing-into-limit-attributes.patch
queue-4.9/dibusb-fix-possible-memory-leak-in-dibusb_rc_query.patch
queue-4.9/iio-common-st_sensors-fix-channel-data-parsing.patch
queue-4.9/xfs-check-minimum-block-size-for-crc-filesystems.patch
queue-4.9/revert-usb-gadget-composite-always-set-ep-mult-to-a.patch
queue-4.9/usb-musb-core-add-clear_ep_rxintr-to-musb_platform_ops.patch
queue-4.9/usb-serial-io_edgeport-fix-null-deref-at-open.patch
queue-4.9/usb-serial-mos7720-fix-parport-use-after-free-on-probe-errors.patch
queue-4.9/usb-serial-mos7720-fix-use-after-free-on-probe-errors.patch
queue-4.9/kvm-x86-reset-mmu-on-kvm_set_vcpu_events.patch
queue-4.9/arm-dts-r8a7794-correct-hsusb-parent-clock.patch
queue-4.9/iommu-vt-d-flush-old-iommu-caches-for-kdump-when-the-device-gets-context-mapped.patch
queue-4.9/mm-khugepaged-fix-radix-tree-node-leak-in-shmem-collapse-error-path.patch
queue-4.9/xfs-handle-cow-fork-in-xfs_bmap_trace_exlist.patch
queue-4.9/usb-musb-fix-trying-to-free-already-free-irq-4.patch
queue-4.9/usb-xhci-mem-use-passed-in-gfp-flags-instead-of-gfp_kernel.patch
queue-4.9/tpm_tis-check-return-values-from-get_burstcount.patch
queue-4.9/iio-accel-st_accel-fix-lis3lv02-reading-and-scaling.patch
queue-4.9/iommu-amd-missing-error-code-in-amd_iommu_init_device.patch
queue-4.9/usb-xhci-apply-xhci_pme_stuck_quirk-to-intel-apollo-lake.patch
queue-4.9/fscrypt-fix-renaming-and-linking-special-files.patch
queue-4.9/usb-fix-problems-with-duplicate-endpoint-addresses.patch
queue-4.9/usb-dwc3-ep0-add-dwc3_ep0_prepare_one_trb.patch
queue-4.9/clk-sunxi-ng-sun8i-a23-set-clk_set_rate_parent-for-audio-module-clocks.patch
queue-4.9/staging-octeon-call-set_netdev_dev.patch
queue-4.9/efi-efivar_ssdt_load-don-t-return-success-on-allocation-failure.patch
queue-4.9/pci-msi-check-for-null-affinity-mask-in-pci_irq_get_affinity.patch
queue-4.9/usb-xhci-hold-lock-over-xhci_abort_cmd_ring.patch
queue-4.9/usb-serial-mos7840-fix-null-deref-at-open.patch
queue-4.9/scsi-g_ncr5380-fix-release_region-in-error-handling.patch
queue-4.9/drm-i915-dp-add-lane_count-check-in-intel_dp_check_link_status.patch
queue-4.9/crypto-arm-aes-ce-fix-for-big-endian.patch
queue-4.9/crypto-arm64-aes-ccm-ce-fix-for-big-endian.patch
queue-4.9/mm-khugepaged-close-use-after-free-race-during-shmem-collapsing.patch
queue-4.9/crypto-arm64-sha2-ce-fix-for-big-endian.patch
queue-4.9/drm-i915-fix-oops-in-overlay-due-to-frontbuffer-tracking.patch
queue-4.9/xfs-error-out-if-trying-to-add-attrs-and-anextents-0.patch
queue-4.9/mm-compaction-fix-nr_isolated_-stats-for-pfn-based-migration.patch
queue-4.9/arm64-dts-hip06-correct-hardware-pin-number-of-usb-node.patch
queue-4.9/usb-storage-unusual_uas-add-jmicron-jms56x-to-unusual-device.patch
queue-4.9/xfs-don-t-bug-on-mixed-direct-and-mapped-i-o.patch
queue-4.9/drm-i915-gen9-unconditionally-apply-the-memory-bandwidth-wa.patch
queue-4.9/gcc-plugins-update-gcc-common.h-for-gcc-7.patch
queue-4.9/debugfs-improve-define_debugfs_attribute-for-config_debug_fs.patch
queue-4.9/alsa-usb-audio-fix-irq-process-data-synchronization.patch
queue-4.9/xfs-use-new-extent-lookup-helpers-xfs_file_iomap_begin_delay.patch
queue-4.9/drm-i915-disable-psr-by-default-on-hsw-bdw.patch
queue-4.9/staging-iio-ad7606-fix-improper-setting-of-oversampling-pins.patch
queue-4.9/usb-dwc3-gadget-fix-full-speed-mode.patch
queue-4.9/xfs-fix-unbalanced-inode-reclaim-flush-locking.patch
queue-4.9/cris-only-build-flash-rescue-image-if-config_etrax_axisflashmap-is-selected.patch
queue-4.9/genirq-affinity-fix-node-generation-from-cpumask.patch
queue-4.9/hwmon-g762-fix-overflows-and-crash-seen-when-writing-limit-attributes.patch
queue-4.9/iio-bmi160-fix-time-needed-to-sleep-after-command-execution.patch
queue-4.9/xfs-use-new-extent-lookup-helpers-in-__xfs_reflink_reserve_cow.patch
queue-4.9/f2fs-hide-a-maybe-uninitialized-warning.patch
queue-4.9/ath10k-use-the-right-length-of-background.patch
queue-4.9/xfs-don-t-crash-if-reading-a-directory-results-in-an-unexpected-hole.patch
queue-4.9/usb-serial-omninet-fix-null-derefs-at-open-and-disconnect.patch
queue-4.9/usb-dwc3-pci-add-intel-gemini-lake-pci-id.patch
queue-4.9/usb-gadgetfs-fix-unbounded-memory-allocation-bug.patch
queue-4.9/xfs-remove-prev-argument-to-xfs_bmapi_reserve_delalloc.patch
queue-4.9/parisc-add-line-break-when-printing-segfault-info.patch
queue-4.9/tick-broadcast-prevent-null-pointer-dereference.patch
queue-4.9/rpmsg-qcom_smd-correct-return-value-for-o_nonblock.patch
queue-4.9/crypto-arm64-sha1-ce-fix-for-big-endian.patch
queue-4.9/xfs-clean-up-cow-fork-reservation-and-tag-inodes-correctly.patch
queue-4.9/usb-serial-keyspan_pda-verify-endpoints-at-probe.patch
queue-4.9/usb-serial-io_ti-fix-another-null-deref-at-open.patch
queue-4.9/asoc-intel-skylake-fix-a-shift-wrapping-bug.patch
queue-4.9/iommu-amd-fix-the-left-value-check-of-cmd-buffer.patch
queue-4.9/xfs-forbid-ag-btrees-with-level-0.patch
queue-4.9/xfs-provide-helper-for-counting-extents-from-if_bytes.patch
queue-4.9/input-synaptics-rmi4-unlock-on-error.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html