This is a note to let you know that I've just added the patch titled
Revert "USB: gadget: Allow function access to device ID data during bind()"
to the 2.6.36-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-allow-function-access-to-device-id-data-during-bind.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <[email protected]>
Date: Thu, 16 Dec 2010 15:52:30 -0800
Subject: Revert "USB: gadget: Allow function access to device ID data during
bind()"
From: Greg Kroah-Hartman <[email protected]>
commit dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca upstream.
This reverts commit 1ab83238740ff1e1773d5c13ecac43c60cf4aec4.
Turns out this doesn't allow for the device ids to be overridden
properly, so we need to revert the thing.
Reported-by: Jef Driesen <[email protected]>
Cc: Robert Lukassen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/gadget/composite.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1083,14 +1083,6 @@ static int composite_bind(struct usb_gad
*/
usb_ep_autoconfig_reset(cdev->gadget);
- /* standardized runtime overrides for device ID data */
- if (idVendor)
- cdev->desc.idVendor = cpu_to_le16(idVendor);
- if (idProduct)
- cdev->desc.idProduct = cpu_to_le16(idProduct);
- if (bcdDevice)
- cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
-
/* composite gadget needs to assign strings for whole device (like
* serial number), register function drivers, potentially update
* power state and consumption, etc
@@ -1102,6 +1094,14 @@ static int composite_bind(struct usb_gad
cdev->desc = *composite->dev;
cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
+ /* standardized runtime overrides for device ID data */
+ if (idVendor)
+ cdev->desc.idVendor = cpu_to_le16(idVendor);
+ if (idProduct)
+ cdev->desc.idProduct = cpu_to_le16(idProduct);
+ if (bcdDevice)
+ cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
+
/* strings can't be assigned before bind() allocates the
* releavnt identifiers
*/
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.36/nohz-fix-get_next_timer_interrupt-vs-cpu-hotplug.patch
queue-2.6.36/edac-fix-workqueue-related-crashes.patch
queue-2.6.36/drm-radeon-kms-don-t-apply-7xx-hdp-flush-workaround-on-agp.patch
queue-2.6.36/driver-net-benet-fix-be_cmd_multicast_set-memcpy-bug.patch
queue-2.6.36/md-protect-against-null-reference-when-waiting-to-start-a-raid10.patch
queue-2.6.36/sparc64-delete-prom_puts-unused.patch
queue-2.6.36/hwmon-adm1026-fix-setting-fan_div.patch
queue-2.6.36/sparc-remove-prom_pathtoinode.patch
queue-2.6.36/n_gsm-gsm_data_alloc-buffer-allocation-could-fail-and-it-is-not-being-checked.patch
queue-2.6.36/bridge-fix-ipv6-queries-for-bridge-multicast-snooping.patch
queue-2.6.36/asoc-fix-swap-of-left-and-right-channels-for-wm8993-4-speaker-boost-gain.patch
queue-2.6.36/x86-hotplug-use-mwait-to-offline-a-processor-fix-the-legacy-case.patch
queue-2.6.36/md-fix-bug-with-re-adding-of-partially-recovered-device.patch
queue-2.6.36/gpio-fix-null-pointer-dereference-while-accessing-rdc321x-platform_data.patch
queue-2.6.36/tcp-protect-sysctl_tcp_cookie_size-reads.patch
queue-2.6.36/asoc-fix-deemphasis-control-in-wm8904-55-60-codecs.patch
queue-2.6.36/usb-usb-storage-unusual_devs-entry-for-the-samsung-yp-cp3.patch
queue-2.6.36/arch-x86-oprofile-op_model_amd.c-perform-initialisation-on-a-single-cpu.patch
queue-2.6.36/x86-xsave-use-alloc_bootmem_align-instead-of-alloc_bootmem.patch
queue-2.6.36/tcp-don-t-change-unlocked-socket-state-in-tcp_v4_err.patch
queue-2.6.36/net-dst-dst_dev_event-called-after-other-notifiers.patch
queue-2.6.36/r8169-fix-sleeping-while-holding-spinlock.patch
queue-2.6.36/l2tp-fix-modalias-of-l2tp_ip.patch
queue-2.6.36/revert-usb-gadget-allow-function-access-to-device-id-data-during-bind.patch
queue-2.6.36/sparc64-delete-prom_setcallback.patch
queue-2.6.36/alsa-hda-enable-jack-sense-for-thinkpad-edge-11.patch
queue-2.6.36/pppoe.c-fix-kernel-panic-caused-by-__pppoe_xmit.patch
queue-2.6.36/bonding-fix-slave-selection-bug.patch
queue-2.6.36/nfsd-fix-possible-bug_on-firing-in-set_change_info.patch
queue-2.6.36/rtc-rs5c372-fix-buffer-size.patch
queue-2.6.36/x86-amd-fix-panic-on-amd-cpu-family-0x15.patch
queue-2.6.36/sparc-do-not-export-prom_nb-get-put-char.patch
queue-2.6.36/drm-i915-always-set-the-dp-transcoder-config-to-8bpc.patch
queue-2.6.36/input-synaptics-fix-handling-of-2-button-clickpads.patch
queue-2.6.36/nfs-fix-panic-after-nfs_umount.patch
queue-2.6.36/x86-vt-d-fix-the-vt-d-fault-handling-irq-migration-in-the-x2apic-mode.patch
queue-2.6.36/ath9k-fix-bug-in-tx-power.patch
queue-2.6.36/asoc-wm8580-fix-r8-initial-value.patch
queue-2.6.36/n_gsm-fix-message-length-handling-when-building-header.patch
queue-2.6.36/cs5535-gpio-don-t-apply-errata-36-to-edge-detect-gpios.patch
queue-2.6.36/econet-do-the-correct-cleanup-after-an-unprivileged-siocsifaddr.patch
queue-2.6.36/sparc-write-to-prom-console-using-indirect-buffer.patch
queue-2.6.36/watchdog-improve-initialisation-error-message-and-documentation.patch
queue-2.6.36/econet-fix-crash-in-aun_incoming.patch
queue-2.6.36/sparc-delete-prom_-getchar.patch
queue-2.6.36/ath9k-fix-sta-disconnect-issue-due-to-received-mic-failed-bcast-frames.patch
queue-2.6.36/net-fix-skb_defer_rx_timestamp.patch
queue-2.6.36/alsa-hda-do-not-wrongly-restrict-min_channels-based-on-eld.patch
queue-2.6.36/xhci-fix-issue-with-port-array-setup-and-buggy-hosts.patch
queue-2.6.36/ath9k-fix-bug-in-reading-input-gpio-state-for-ar9003.patch
queue-2.6.36/net-fix-header-size-check-for-gso-case-in-recvmsg-af_packet.patch
queue-2.6.36/acpi-ec-add-another-dmi-match-entry-for-msi-hardware.patch
queue-2.6.36/net-ax25-fix-information-leak-to-userland.patch
queue-2.6.36/sparc-kill-prom-devops_-32-64-.c.patch
queue-2.6.36/filter-fix-sk_filter-rcu-handling.patch
queue-2.6.36/firewire-ohci-fix-regression-with-agere-fw643-rev-06-disable-msi.patch
queue-2.6.36/sunrpc-prevent-use-after-free-on-clearing-xpt_busy.patch
queue-2.6.36/cls_cgroup-fix-crash-on-module-unload.patch
queue-2.6.36/printk-fix-wake_up_klogd-vs-cpu-hotplug.patch
queue-2.6.36/sparc-pass-buffer-pointer-all-the-way-down-to-prom_-get-put-char.patch
queue-2.6.36/mmc-atmel-mci-fix-multiblock-sdio-transfers.patch
queue-2.6.36/alsa-hda-use-model-lg-quirk-for-lg-p1-express-to-enable-playback-and-capture.patch
queue-2.6.36/acpica-fix-scope-op-in-module-level-code.patch
queue-2.6.36/af_unix-limit-unix_tot_inflight.patch
queue-2.6.36/tcp-increase-tcp_maxseg-socket-option-minimum.patch
queue-2.6.36/x86-enable-the-intr-remap-fault-handling-after-local-apic-setup.patch
queue-2.6.36/asoc-fix-off-by-one-error-in-wm8994-eq-register-bank-size.patch
queue-2.6.36/ramoops-don-t-overflow-over-non-allocated-regions.patch
queue-2.6.36/inotify-stop-kernel-memory-leak-on-file-creation-failure.patch
queue-2.6.36/ifb-goto-resched-directly-if-error-happens-and-dp-tq-isn-t-empty.patch
queue-2.6.36/tcp-make-tcp_maxseg-minimum-more-correct.patch
queue-2.6.36/fuse-verify-ioctl-retries.patch
queue-2.6.36/cs5535-gpio-handle-gpio-regs-where-higher-clear-bits-are-set.patch
queue-2.6.36/x25-decrement-netdev-reference-counts-on-unload.patch
queue-2.6.36/nfs-fix-fcntl-f_getlk-not-reporting-some-conflicts.patch
queue-2.6.36/bootmem-add-alloc_bootmem_align.patch
queue-2.6.36/orinoco-clear-countermeasure-setting-on-commit.patch
queue-2.6.36/ib-uverbs-handle-large-number-of-entries-in-poll-cq.patch
queue-2.6.36/pm-hibernate-fix-pm_post_-notification-with-user-space-suspend.patch
queue-2.6.36/llc-fix-a-device-refcount-imbalance.patch
queue-2.6.36/tcp-bug-fix-in-initialization-of-receive-window.patch
queue-2.6.36/sched-cure-more-no_hz-load-average-woes.patch
queue-2.6.36/mips-jz4740-qi_lb60-fix-gpio-for-the-6th-row-of-the-keyboard-matrix.patch
queue-2.6.36/x86-vt-d-quirk-for-masking-vtd-spec-errors-to-platform-error-handling-logic.patch
queue-2.6.36/install_special_mapping-skips-security_file_mmap-check.patch
queue-2.6.36/ath9k_hw-fix-endian-issues-with-ctls-on-ar9003.patch
queue-2.6.36/arch-tile-handle-clone_settls-in-copy_thread-not-user-space.patch
queue-2.6.36/hwmon-adm1026-allow-1-as-a-valid-divider-value.patch
queue-2.6.36/p54usb-new-usb-id-for-gemtek-wubi-100gw.patch
queue-2.6.36/alsa-hda-use-position_fix-1-for-acer-aspire-5538-to-enable-capture-on-internal-mic.patch
queue-2.6.36/xen-provide-a-variant-of-__ring_size-that-is-an-integer-constant-expression.patch
queue-2.6.36/tracing-fix-panic-when-lseek-called-on-trace-opened-for-writing.patch
queue-2.6.36/tehuti-firmware-filename-is-tehuti-bdx.bin.patch
queue-2.6.36/firewire-ohci-fix-regression-with-via-vt6315-disable-msi.patch
queue-2.6.36/af_unix-limit-recursion-level.patch
queue-2.6.36/orinoco-fix-tkip-countermeasure-behaviour.patch
queue-2.6.36/mmc-at91_mci-fix-multiblock-sdio-transfers.patch
queue-2.6.36/mmc-fix-re-probing-with-pm_post_restore-notification.patch
queue-2.6.36/mac80211-fix-bug-in-pskb_expand_head-when-transmitting-shared-skbs.patch
queue-2.6.36/drm-radeon-kms-fix-vram-base-calculation-on-rs780-rs880.patch
queue-2.6.36/p54usb-add-5-more-usbids.patch
queue-2.6.36/pm-runtime-fix-pm_runtime_suspended.patch
queue-2.6.36/nouveau-acknowledge-hpd-irq-in-handler-not-bottom-half.patch
queue-2.6.36/drm-kms-remove-spaces-from-connector-names-v2.patch
queue-2.6.36/net-packet-fix-information-leak-to-userland.patch
queue-2.6.36/tcp-avoid-a-possible-divide-by-zero.patch
queue-2.6.36/ath9k-disable-swba-interrupt-on-remove_interface.patch
queue-2.6.36/sparc64-unexport-prom_service_exists.patch
queue-2.6.36/usb-ftdi_sio-add-d.o.tec-pid.patch
queue-2.6.36/fuse-fix-ioctl-when-server-is-32bit.patch
queue-2.6.36/alsa-hda-always-allow-basic-audio-irrespective-of-eld-info.patch
queue-2.6.36/alsa-hda-quirk-for-dell-vostro-320-to-make-microphone-work.patch
queue-2.6.36/sparc-leon-removed-constant-timer-initialization-as-if-hz-100-now-it-reflects-the-value-of-hz.patch
queue-2.6.36/qla2xxx-populate-command-type-6-lun-field-properly.patch
queue-2.6.36/fix-freeing-user_struct-in-user-cache.patch
queue-2.6.36/watchdog-fix-null-pointer-dereference-while-accessing-rdc321x-platform_data.patch
queue-2.6.36/qla2xxx-correct-issue-where-npiv-config-data-was-not-being-allocated-for-82xx-parts.patch
queue-2.6.36/8139cp-fix-checksum-broken.patch
queue-2.6.36/amd64_edac-fix-interleaving-check.patch
queue-2.6.36/x86-gcc-4.6-use-gcc-m-options-when-building-vdso.patch
queue-2.6.36/arm-6535-1-v6-mpcore-v6_dma_inv_range-and-v6_dma_flush_range-rwfo-fix.patch
queue-2.6.36/x86-vt-d-handle-previous-faults-after-enabling-fault-handling.patch
queue-2.6.36/rt2x00-fix-max-tx-power-settings.patch
queue-2.6.36/usb-misc-uss720.c-add-another-vendor-product-id.patch
queue-2.6.36/nohz-fix-printk_needs_cpu-return-value-on-offline-cpus.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
