aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-02-07Revert "skge: check for PCI dma mapping errors"stephen hemminger1-58/+13
As reported by several people... The code in rx_clean was panic'ing so revert commit d0249e44432aa0ffcf710b64449b8eaa3722547e. Will redo DMA mapping checks as new patches for a later release. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-02-07perf: Fix double start/stop in x86_pmu_start()Stephane Eranian2-5/+17
The following patch fixes a bug introduced by the following commit: e050e3f0a71b ("perf: Fix broken interrupt rate throttling") The patch caused the following warning to pop up depending on the sampling frequency adjustments: ------------[ cut here ]------------ WARNING: at arch/x86/kernel/cpu/perf_event.c:995 x86_pmu_start+0x79/0xd4() It was caused by the following call sequence: perf_adjust_freq_unthr_context.part() { stop() if (delta > 0) { perf_adjust_period() { if (period > 8*...) { stop() ... start() } } } start() } Which caused a double start and a double stop, thus triggering the assert in x86_pmu_start(). The patch fixes the problem by avoiding the double calls. We pass a new argument to perf_adjust_period() to indicate whether or not the event is already stopped. We can't just remove the start/stop from that function because it's called from __perf_event_overflow where the event needs to be reloaded via a stop/start back-toback call. The patch reintroduces the assertion in x86_pmu_start() which was removed by commit: 84f2b9b ("perf: Remove deprecated WARN_ON_ONCE()") In this second version, we've added calls to disable/enable PMU during unthrottling or frequency adjustment based on bug report of spurious NMI interrupts from Eric Dumazet. Reported-and-tested-by: Eric Dumazet <[email protected]> Signed-off-by: Stephane Eranian <[email protected]> Acked-by: Peter Zijlstra <[email protected]> Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/20120207133956.GA4932@quad [ Minor edits to the changelog and to the code ] Signed-off-by: Ingo Molnar <[email protected]>
2012-02-07ALSA: hda - add support for Uniwill ECS M31EI notebookJaroslav Kysela1-0/+1
This hardware requires same fixup for the node 0x0f like Asus A6Rp. More information: https://bugzilla.redhat.com/show_bug.cgi?id=785417 Signed-off-by: Jaroslav Kysela <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-02-07HID: wiimote: fix invalid power_supply_powers callJiri Kosina1-2/+2
Analogically to d7cb3dbd1 ("HID: wacom: Fix invalid power_supply_powers calls"), fix also the same occurence in wiimote driver. Reported-by: [email protected] Signed-off-by: Jiri Kosina <[email protected]>
2012-02-07ALSA: hda - Fix error handling in patch_ca0132.cTakashi Iwai1-14/+19
In patch_ca0132.c, the error returned from chipio_write() isn't checked always. Also, the power-up/down sequence isn't tracked properly in some error paths. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-02-07Merge tag 'asoc-3.3' of ↵Takashi Iwai5-13/+19
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus The only particularly remarkable change here is the one for handling of the Android suspend ignore code for idle_bias_off CODECs. That one is actually a regression fix as some of the new power savings that have been introduced confused the suspend ignore code, making devices that are active for non-audio reasons look like they are idle causing them to be suspended instead of being kept active.
2012-02-07Merge tag 'perf-urgent-for-mingo' of ↵Ingo Molnar3-1/+8
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent Fixes for some long standing problems. Signed-off-by: Ingo Molnar <[email protected]>
2012-02-07mtip32xx: removed the irrelevant argument of mtip_hw_submit_io() and the ↵Asai Thambi S P2-11/+5
unused member of struct driver_data Removed the following: * irrelevant argument 'barrier' of mtip_hw_submit_io() * unused member 'eh_active' of struct driver_data Signed-off-by: Asai Thambi S P <[email protected]> Signed-off-by: Sam Bradshaw <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-02-07block: strip out locking optimization in put_io_context()Tejun Heo8-92/+18
put_io_context() performed a complex trylock dancing to avoid deferring ioc release to workqueue. It was also broken on UP because trylock was always assumed to succeed which resulted in unbalanced preemption count. While there are ways to fix the UP breakage, even the most pathological microbench (forced ioc allocation and tight fork/exit loop) fails to show any appreciable performance benefit of the optimization. Strip it out. If there turns out to be workloads which are affected by this change, simpler optimization from the discussion thread can be applied later. Signed-off-by: Tejun Heo <[email protected]> LKML-Reference: <1328514611.21268.66.camel@sli10-conroe> Signed-off-by: Jens Axboe <[email protected]>
2012-02-07target: Fix unsupported WRITE_SAME sense payloadMartin Svec1-3/+3
This patch fixes a bug in target-core where unsupported WRITE_SAME ops from a target_check_write_same_discard() failure was incorrectly returning CHECK_CONDITION w/ TCM_INVALID_CDB_FIELD sense data. This was causing some clients to not properly fall back, so go ahead and use the correct TCM_UNSUPPORTED_SCSI_OPCODE sense for this case. Reported-by: Martin Svec <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-07iscsi: use IP_FREEBIND socket optionDax Kelson1-0/+8
Use IP_FREEBIND socket option so that iscsi portal configuration with explicit IP addresses can happen during boot, before network interfaces have been assigned IPs. This is especially important on systemd based Linux boxes where system boot happens asynchronously and non-trivial configuration must be done to get targetcli.service to start synchronously after the network is configured. Reference: http://lists.fedoraproject.org/pipermail/devel/2011-October/158025.html Signed-off-by: Dax Kelson <[email protected]> Cc: "Nicholas A. Bellinger" <[email protected]> Cc: "Andy Grover" <[email protected]> Cc: "Lennart Poettering" <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-07iblock: fix handling of large requestsChristoph Hellwig1-0/+7
Requesting to many bvecs upsets bio_alloc_bioset, so limit the number we ask for to the amount it can handle. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-07target: handle empty string writes in sysfsDan Carpenter1-4/+8
These are root only and we're not likely to hit the problem in practise, but it makes the static checkers happy. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-07iscsi_target: in_aton needs linux/inet.hStephen Rothwell1-0/+1
Fixes this error after a recent nfs cleanup: drivers/target/iscsi/iscsi_target_configfs.c: In function 'lio_target_call_addnptotpg': drivers/target/iscsi/iscsi_target_configfs.c:214:3: error: implicit declaration of function 'in6_pton' [-Werror=implicit-function-declaration] drivers/target/iscsi/iscsi_target_configfs.c:239:3: error: implicit declaration of function 'in_aton' [-Werror=implicit-function-declaration] Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-07target: Fix iblock se_dev_attrib.unmap_granularityMarco Sanvido1-1/+1
The block layer keeps q->limits.discard_granularity in bytes, but iblock (and the SCSI Block Limits VPD page) keep unmap_granularity in blocks. Report the correct value when exporting block devices by dividing to convert bytes to blocks. Signed-off-by: Roland Dreier <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-07target: Fix target_submit_cmd() exception handlingNicholas Bellinger1-8/+10
This patch fixes a bug in target_submit_cmd() where the failure path for transport_generic_allocate_tasks() made a direct call to transport_send_check_condition_and_sense() and not calling the final target_put_sess_cmd() release callback. For transport_generic_allocate_tasks() failures, use the proper call to transport_generic_request_failure() to handle kref_put() along with potential internal queue full response processing. It also makes transport_lookup_cmd_lun() failures in target_submit_cmd() use transport_send_check_condition_and_sense() and target_put_sess_cmd() directly to avoid se_cmd->se_dev reference in transport_generic_request_failure() handling. Finally it drops the out_check_cond: label and use direct reference for allocate task failures, and per-se_device queue_full handling is currently not supported for transport_lookup_cmd_lun() failure descriptors due to se_device dependency. Reported-by: Roland Dreier <[email protected]> Cc: Roland Dreier <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-07target: Change target_submit_cmd() to return voidAndy Grover3-11/+5
Retval not very useful, and may even be harmful. Once submitted, fabrics should expect a sense error if anything goes wrong. All fabrics checking of this retval are useless or broken: fc checks it just to emit more debug output. ib_srpt trickles retval up, then it is ignored. qla2xxx trickles it up, which then causes a bug because the abort goto in qla_target.c thinks cmd hasn't been sent to target. Just returning nothing is best. Signed-off-by: Andy Grover <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-07target: accept REQUEST_SENSE with 18bytesSebastian Andrzej Siewior1-10/+4
WindowsXP+BOT issues a MODE_SENSE request with page 0x1c which is not suppoerted by target. Target rejects that command with TCM_INVALID_CDB_FIELD, so far so good. On BOT I can't send the SENSE response back, instead I can only reply that an error occured. The next thing happens is a REQUEST_SENSE request with 18 bytes length. Since the check here is more than 18 bytes I have to NACK that request as well. This is not really required: We check for some additional room, but we never use it. The additional length is set to 0xa so the total length is 0xa + 8 = 18 which is fine with my 18 bytes. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-02-06ARM: tegra: paz00: fix wrong UART port on mini-pcie plugMarc Dietrich2-6/+6
UARTC is connected to the mini-pcie port. Signed-off-by: Marc Dietrich <[email protected]> Acked-by: Stephen Warren <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2012-02-06ARM: tegra: paz00: fix wrong SD1 power gpioMarc Dietrich2-2/+2
The power gpio for the external memory card was specified wrongly. Replace it with the correct value (tested with warmboot with fastboot). Signed-off-by: Marc Dietrich <[email protected]> Acked-by: Stephen Warren <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2012-02-06i2c: tegra: Add devexit_p() for removeShubhrajyoti Datta1-1/+1
It was originally missed in the __devinit/__devexit annotations. Signed-off-by: Shubhrajyoti D <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Ben Dooks <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2012-02-07md: two small fixes to handling interrupt resync.NeilBrown1-2/+3
1/ If a resync is aborted we should record how far we got (recovery_cp) the last request that we know has completed (->curr_resync_completed) rather than the last request that was submitted (->curr_resync). 2/ When a resync aborts we still want to update the metadata with any changes, so set MD_CHANGE_DEVS even if we 'skip'. Signed-off-by: NeilBrown <[email protected]>
2012-02-06Documentation: update quilt tree location for Documentation patchesRandy Dunlap1-1/+1
Update quilt tree location for Documentation/ patches. Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-02-06Documentation: add missing tainted bits to Documentation/sysctl/kernel.txtLarry Finger1-0/+2
Two of the bits in the tainted flag are not documented. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-02-06Merge branch 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds4-1/+113
Fixing a regression with the PMU MSRs when PMU virtualization is disabled, a guest-internal DoS with the SYSCALL instruction, and a dirty memory logging race that may cause live migration to fail. * 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: do not #GP on perf MSR writes when vPMU is disabled KVM: x86: fix missing checks in syscall emulation KVM: x86: extend "struct x86_emulate_ops" with "get_cpuid" KVM: Fix __set_bit() race in mark_page_dirty() during dirty logging
2012-02-06Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds4-11/+16
GPIO fixes for v3.3-rc2 Straight forward bug fixes in this branch. A couple of x86 gpio drivers missing spinlock initialization, an API change fixup for the samsung driver and a name typo fix. * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: gpio: Add missing spin_lock_init in gpio-ml-ioh driver gpio: Add missing spin_lock_init in gpio-pch driver gpio: samsung: adapt to changes in gpio specifier translator function declaration Correct bad gpio naming
2012-02-06Merge tag 'hwmon-fixes-for-3.3-rc3' of ↵Linus Torvalds1-3/+20
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging One patch to fix fan detection on NCT6776F. * tag 'hwmon-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (w83627ehf) Fix number of fans for NCT6776F
2012-02-06exec: fix use-after-free bug in setup_new_exec()Heiko Carstens2-17/+19
Setting the task name is done within setup_new_exec() by accessing bprm->filename. However this happens after flush_old_exec(). This may result in a use after free bug, flush_old_exec() may "complete" vfork_done, which will wake up the parent which in turn may free the passed in filename. To fix this add a new tcomm field in struct linux_binprm which contains the now early generated task name until it is used. Fixes this bug on s390: Unable to handle kernel pointer dereference at virtual kernel address 0000000039768000 Process kworker/u:3 (pid: 245, task: 000000003a3dc840, ksp: 0000000039453818) Krnl PSW : 0704000180000000 0000000000282e94 (setup_new_exec+0xa0/0x374) Call Trace: ([<0000000000282e2c>] setup_new_exec+0x38/0x374) [<00000000002dd12e>] load_elf_binary+0x402/0x1bf4 [<0000000000280a42>] search_binary_handler+0x38e/0x5bc [<0000000000282b6c>] do_execve_common+0x410/0x514 [<0000000000282cb6>] do_execve+0x46/0x58 [<00000000005bce58>] kernel_execve+0x28/0x70 [<000000000014ba2e>] ____call_usermodehelper+0x102/0x140 [<00000000005bc8da>] kernel_thread_starter+0x6/0xc [<00000000005bc8d4>] kernel_thread_starter+0x0/0xc Last Breaking-Event-Address: [<00000000002830f0>] setup_new_exec+0x2fc/0x374 Kernel panic - not syncing: Fatal exception: panic_on_oops Reported-by: Sebastian Ott <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-02-06drm/i915: Force explicit bpp selection for intel_dp_link_requiredKeith Packard1-15/+5
It is never correct to use intel_crtc->bpp in intel_dp_link_required, so instead pass an explicit bpp in to this function. This patch only supports 18bpp and 24bpp modes, which means that 10bpc modes will be computed incorrectly. Fixing that will require more extensive changes, and so must be addressed separately from this bugfix. intel_dp_link_required is called from intel_dp_mode_valid and intel_dp_mode_fixup. * intel_dp_mode_valid is called to list supported modes; in this case, the current crtc values cannot be relevant as the modes in question may never be selected. Thus, using intel_crtc->bpp is never right. * intel_dp_mode_fixup is called during mode setting, but it is run well before ironlake_crtc_mode_set is called to set intel_crtc->bpp, so using intel_crtc-bpp in this path can only ever get a stale value. Cc: Lubos Kolouch <[email protected]> Cc: Adam Jackson <[email protected]> Cc: [email protected] Reviewed-by: Daniel Vetter <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42263 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44881 Tested-by: Dave Airlie <[email protected]> Tested-by: [email protected] (Dell Latitude 6510) Tested-by: Roland Dreier <[email protected]> Signed-off-by: Keith Packard <[email protected]>
2012-02-06perf evsel: Fix an issue where perf report fails to show the proper percentageNaveen N. Rao1-0/+1
This patch fixes an issue where perf report shows nan% for certain perf.data files. The below is from a report for a do_fork probe: -nan% sshd [kernel.kallsyms] [k] do_fork -nan% packagekitd [kernel.kallsyms] [k] do_fork -nan% dbus-daemon [kernel.kallsyms] [k] do_fork -nan% bash [kernel.kallsyms] [k] do_fork A git bisect shows commit f3bda2c as the cause. However, looking back through the git history, I saw commit 640c03c which seems to have removed the required initialization for perf_sample->period. The problem only started showing after commit f3bda2c. The below patch re-introduces the initialization and it fixes the problem for me. With the below patch, for the same perf.data: 73.08% bash [kernel.kallsyms] [k] do_fork 8.97% 11-dhclient [kernel.kallsyms] [k] do_fork 6.41% sshd [kernel.kallsyms] [k] do_fork 3.85% 20-chrony [kernel.kallsyms] [k] do_fork 2.56% sendmail [kernel.kallsyms] [k] do_fork This patch applies over current linux-tip commit 9949284. Problem introduced in: $ git describe 640c03c v2.6.37-rc3-83-g640c03c Cc: Ananth N Mavinakayanahalli <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Robert Richter <[email protected]> Cc: Srikar Dronamraju <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Naveen N. Rao <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2012-02-06perf tools: Fix prefix matching for kernel mapsJiri Olsa1-1/+1
In some perf ancient versions we used '[kernel.kallsyms._text]' as the name for the kernel map. This got changed with commit: perf: 'perf kvm' tool for monitoring guest performance from host commit a1645ce12adb6c9cc9e19d7695466204e3f017fe Author: Zhang, Yanmin <[email protected]> and we started to use following name '[kernel.kallsyms]_text'. This name change is important for the report code dealing with ancient perf data. When processing the kernel map event, we need to recognize the old naming (dont match the last ']') and initialize the kernel map correctly. The subsequent call to maps__set_kallsyms_ref_reloc_sym deals with the superfluous ']' to get correct symbol name. Cc: Corey Ashford <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Jiri Olsa <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2012-02-06perf tools: Fix perf stack to non executable on x86_64Jiri Olsa1-0/+6
By adding following objects: bench/mem-memcpy-x86-64-asm.o the x86_64 perf binary ended up with executable stack. The reason was that above object are assembler sourced and is missing the GNU-stack note section. In such case the linker assumes that the final binary should not be restricted at all and mark the stack as RWX. Adding section ".note.GNU-stack" definition to mentioned object, with all flags disabled, thus omiting this object from linker stack flags decision. Problem introduced in: $ git describe ea7872b v2.6.37-rc2-19-gea7872b Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=783570 Reported-by: Clark Williams <[email protected]> Acked-by: Eric Dumazet <[email protected]> Cc: Corey Ashford <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Jiri Olsa <[email protected]> [ committer note: Backported fix to perf/urgent (3.3-rc2+) ] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2012-02-06mlx4: fix DMA mapping leak when allocation failsThadeu Lima de Souza Cascardo1-1/+5
mlx4_en_prepare_rx_desc does not correctly clean up after it finds an allocation failure. It should unmap a page before calling put_page, but it only calls the later. This bug would prevent a device removal using hotplug after setting the device MTU to 9000 and opening the network interface. After the fix, we still see the allocation failure with MTU 9000, but we are able to remove the device. Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-02-06mlx4: allow device removal by fixing dma unmap sizeThadeu Lima de Souza Cascardo3-4/+6
After opening the network interface, Mellanox ConnectX device cannot be removed by hotplug because it has not properly unmapped all DMA memory. It happens that mlx4_en_activate_rx_rings overrides the variable that keeps the size of the memory mapped. This is fixed by passing to mlx4_en_destroy_rx_ring the same size that is given to mlx4_en_create_rx_ring. After applying this patch, hot unplugging the device works after opening the interface. Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-02-06bcma: don't fail for bad SPROM CRCHenrik Rydberg1-3/+1
The brcmsmac driver is now using the bcma SPROM CRC check, which does not recognize all chipsets that were functional prior to the switch. In particular, the current code bails out on odd CRC errors in recent Macbooks. This patch ignores those errors, with the argument that an unrecognized SPROM should be treated similarly to a non-existing one. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2012-02-06regmap: Add debugfs information for the cache statusMark Brown1-0/+9
Show all the cache status flags in debugfs if we have a cache. Signed-off-by: Mark Brown <[email protected]>
2012-02-06regmap: Don't use bitfields for booleansMark Brown1-4/+4
This was a cut'n'paste from some older code. Since we're about to add debugfs support don't do the obvious thing and use bool, use u32 instead (which debugfs has been using since time immemorial). Signed-off-by: Mark Brown <[email protected]>
2012-02-06mlx4_core: use correct port for steeringEugenia Emantayev1-6/+6
Use port number for correct steering (list per port). Before the fix all steering entries (for both physical ports) were managed in first port structures, so we had leakage of resources for port 2. Signed-off-by: Eugenia Emantayev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-02-06mlx4_core: use correct flag for unicast_promiscEugenia Emantayev1-2/+2
Use MLX4_DEV_CAP_FLAG_VEP_UC_STEER for unicast_promisc_add/remove Unicast entries were managed in wrong data structures. Signed-off-by: Eugenia Emantayev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-02-06mlx4_core: fix memory leak at multi_func_cleanupEugenia Emantayev1-5/+5
Perform cleanup also in non-master flow. The VFs use communication channel as well. Signed-off-by: Eugenia Emantayev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-02-06IB/srpt: Don't return freed pointer from srpt_alloc_ioctx_ring()Jesper Juhl1-0/+1
Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
2012-02-06ath9k_hw: fix a RTS/CTS timeout regressionFelix Fietkau1-2/+5
commit adb5066 "ath9k_hw: do not apply the 2.4 ghz ack timeout workaround to cts" reduced the hardware CTS timeout to the normal values specified by the standard, but it turns out while it doesn't need the same extra time that it needs for the ACK timeout, it does need more than the value specified in the standard, but only for 2.4 GHz. This patch brings the CTS timeout value in sync with the initialization values, while still allowing adjustment for bigger distances. Signed-off-by: Felix Fietkau <[email protected]> Cc: [email protected] Reported-by: Seth Forshee <[email protected]> Reported-by: Marek Lindner <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2012-02-06ath9k: fix a WEP crypto related regressionFelix Fietkau1-0/+8
commit b4a82a0 "ath9k_hw: fix interpretation of the rx KeyMiss flag" fixed the interpretation of the KeyMiss flag for keycache based lookups, however WEP encryption uses a static index, so KeyMiss is always asserted for it, even though frames are decrypted properly. Fix this by clearing the ATH9K_RXERR_KEYMISS flag if no keycache based lookup was performed. Signed-off-by: Felix Fietkau <[email protected]> Cc: [email protected] Reported-by: Laurent Bonnans <[email protected]> Reported-by: Jurica Vukadin <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2012-02-06mwifiex: add NULL checks in driver unload pathAmitkumar Karwar2-5/+10
If driver load is failed, sometimes few pointers may remain uninitialized ex. priv->wdev, priv->netdev, adapter->sleep_cfm This will cause NULL pointer dereferance while unloading the driver. Signed-off-by: Amitkumar Karwar <[email protected]> Signed-off-by: Kiran Divekar <[email protected]> Signed-off-by: Bing Zhao <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2012-02-06Merge branch 'v3.3-samsung-fixes-2' of ↵Olof Johansson33-36/+62
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes * 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Correct M-5MOLS sensor clock frequency on Universal C210 board ARM: EXYNOS: Correct framebuffer window size on Nuri board ARM: SAMSUNG: Fix missing api-change from subsys_interface change ARM: EXYNOS: Fix "warning: initialization from incompatible pointer type" ARM: S5PV210: Fix the name of exynos4_clk_hdmiphy_ctrl() for S5PV210 ARM: EXYNOS: Remove build warning without enabling PM ARM: SAMSUNG: Fix platform data setup for I2C adapter 0 ARM: EXYNOS: fix non-SMP builds for EXYNOS4 ARM: S3C6410: Use device names for both I2C clocks ARM: S3C64XX: Make s3c64xx_init_uarts() static
2012-02-06HID: wacom: Fix invalid power_supply_powers callsPrzemo Firszt1-3/+4
power_supply_powers calls added in 35b4c01e2 ("power_supply: add "powers" links to self-powered HID devices") have to be called after power device is created. This patch also fixes the second call - it has to be "ac" instead of "battery" Signed-off-by: Przemo Firszt <[email protected]> Signed-off-by: Chris Bagwell <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2012-02-06Merge branch 'master' of ↵Jiri Kosina5018-92587/+241915
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into upstream-fixes Sync with Linus' tree. This is necessary to have a base for patch that fixes commit 35b4c01e29b ("power_supply: add "powers" links to self-powered HID devices") which went in through Anton's tree.
2012-02-06ASoC: wm8994: Enabling VMID should take a runtime PM referenceMark Brown1-0/+4
We can enable VMID independently of the bias in some use cases so we need to ensure that the core device is powered up. Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2012-02-06ALSA: hda/realtek - Fix a wrong conditionTakashi Iwai1-1/+1
sparse complains that "spec->multiout.dac_nids" is a pointer. sound/pci/hda/patch_realtek.c:2321:37: error: incompatible types for operation (>) sound/pci/hda/patch_realtek.c:2321:37: left side has type unsigned short const [usertype] *dac_nids sound/pci/hda/patch_realtek.c:2321:37: right side has type int It was meant to be num_dacs instead of dac_nids. Although the current code still works as expected (when num_dacs is zero, dac_nids should be NULL, too), better to fix now, of course. Reported-by: Dan Carpenter <[email protected]> Cc: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-02-06ALSA: emu8000: Remove duplicate linux/moduleparam.h include from emu8000_patch.cJesper Juhl1-1/+0
The header 'linux/moduleparam.h' is included twice in 'sound/isa/sb/emu8000_patch.c'. Once is enough. Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>