aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-26x86, cpufeature: Remove stray %s, add -w to mkcapflags.plH. Peter Anvin1-2/+2
There was a stray %s left from testing, remove it. Add -w to the #! line (which is parsed by Perl even if the Perl interpreter is invoked explicitly on the command line) to catch these kinds of errors in the future. Reported-by: Jean Delvare <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: H. Peter Anvin <[email protected]>
2012-06-26ALSA: hda - Initialize caches at codec reconfigurationTakashi Iwai1-0/+2
Better to clean up the caches for avoiding inconsistent codec state after the reconfiguration. Signed-off-by: Takashi Iwai <[email protected]>
2012-06-26ALSA: hda - Fix memory leaks at module unloadTakashi Iwai1-0/+2
Some caches aren't released properly at module unloading time. Cc: <[email protected]> [v3.4+] Signed-off-by: Takashi Iwai <[email protected]>
2012-06-26ALSA: hda - Fix memory leaks in Realtek & Conexant codec parsersTakashi Iwai4-2/+16
When moved to the helper code, forgot to release the verb arrays. Signed-off-by: Takashi Iwai <[email protected]>
2012-06-26drm/nouveau/fbcon: using nv_two_heads is not a good ideaBen Skeggs1-1/+1
nv_two_heads() was never meant to be used outside of pre-nv50 code. The code checks for >= NV_10 for 2 CRTCs, then downgrades a few specific chipsets to 1 CRTC based on (pci_device & 0x0ff0). The breakage example seen is on GTX 560Ti, with a pciid of 0x1200, which gets detected as an NV20 (0x020x) with 1 CRTC by nv_two_heads(), causing memory corruption because there's actually 2 CRTCs.. This switches fbcon to use the CRTC count directly from the mode_config structure, which will also fix the same issue on Kepler boards which have 4 CRTCs. Signed-off-by: Ben Skeggs <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2012-06-26ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=nKevin Hilman1-5/+0
commit 8259573b (ARM: OMAP2+: nand: Make board_onenand_init() visible to board code) broke the build for configs with OneNAND disabled. By removing the static in the header file, it created a duplicate definition in the .c and the .h files, resuling in a build error: /work/kernel/omap/dev/arch/arm/mach-omap2/board-flash.c:102:111: error: redefinition of 'board_onenand_init' /work/kernel/omap/dev/arch/arm/mach-omap2/board-flash.h:56:51: note: previous definition of 'board_onenand_init' was here make[2]: *** [arch/arm/mach-omap2/board-flash.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/arm/mach-omap2] Error 2 make: *** [sub-make] Error 2 Fix this by removing the duplicate dummy entry from the C file. Cc: Enric Balletbò i Serra <[email protected]> Cc: Javier Martinez Canillas <[email protected]> Signed-off-by: Kevin Hilman <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2012-06-25clk: mxs: fix clock lookup after freeing init memoryMarc Kleine-Budde2-20/+20
The struct clk_lookup are marked as __initdata, resulting in being removed from memory after the kernel finished booting. However this leads to a NULL pointer de-ref if loading a module which uses clk_get. This patch removes the __initdata from the struct clk_lookup. Signed-off-by: Marc Kleine-Budde <[email protected]> Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Mike Turquette <[email protected]>
2012-06-25clk: mxs: fix ref_io clock definitionShawn Guo1-2/+2
The definition of clocks ref_io0 and ref_io1 were inverted. It causes a mmc regression on some boards right away. Fix the regression by correcting the ref_io clock definition. Reported-by: Maxime Ripard <[email protected]> Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Mike Turquette <[email protected]>
2012-06-25clk: Check parent for NULL in clk_change_ratePawel Moll1-4/+7
clk_change_rate() is accessing parent's rate without checking if the parent exists at all. In case of root clocks this will cause NULL pointer dereference. This patch follows what clk_calc_new_rates() does in such situation. Signed-off-by: Pawel Moll <[email protected]> Signed-off-by: Mike Turquette <[email protected]> Cc: [email protected]
2012-06-25clk: Allow late cache allocation for clk->parentsRajendra Nayak1-5/+10
Parent clocks for muxes are cached in clk->parents to avoid frequent lookups, however the cache allocation happens only during clock registeration and later clk_set_parent() assumes a cache space available and allocated. This is not entirely true for platforms which do early clock registerations wherein the cache allocation using kzalloc could fail during clock registeration. Allow cache allocation to happen later as part of clk_set_parent() to help such cases and avoid crashes assuming a cache being available. While here also replace existing kmalloc() with kzalloc() in the file. Signed-off-by: Rajendra Nayak <[email protected]> Signed-off-by: Mike Turquette <[email protected]> Cc: [email protected]
2012-06-25clk: SPEAr600: Fix ethernet clock name for DT based probingStefan Roese1-1/+1
Signed-off-by: Stefan Roese <[email protected]> Cc: Viresh Kumar <[email protected]> Cc: Viresh Kumar <[email protected]> Signed-off-by: Mike Turquette <[email protected]>
2012-06-25mac802154: add missed braces[email protected]1-1/+2
Add missed braces after 'if' operator. Signed-off-by: Alexander Smirnov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25net: l2tp_eth: fix l2tp_eth_dev_xmit raceEric Dumazet1-3/+3
Its illegal to dereference skb after giving it to l2tp_xmit_skb() as it might be already freed/reused. Signed-off-by: Eric Dumazet <[email protected]> Cc: James Chapman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25net/mlx4_en: Release QP range in free_resourcesYevgeny Petrilin2-4/+9
Add a missing resource release in ring cleanup. Not doing this leaves a range of QPs that are being reserved, and no one can use them. Signed-off-by: Yevgeny Petrilin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25net/mlx4: Use single completion vector after NOP failureYevgeny Petrilin1-0/+2
Fix a crash at the error flow of NOP command which caused the driver to try and use a completion vector which wasn't allocated. Signed-off-by: Yevgeny Petrilin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25net/mlx4_en: Set correct port parameters during device initializationYevgeny Petrilin1-2/+4
Set valid port parameters: MTU and flow control configuration when configuring the port during HW device initialization, prior to the net device open() being called. Using invalid parameters (such as all zeros) could lead to bad firmware behavior. Signed-off-by: Yevgeny Petrilin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25ipheth: add support for iPadDavide Gerhard1-0/+5
This adds support for the iPad to the ipheth driver. (product id = 0x129a) Signed-off-by: Davide Gerhard <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25caif-hsi: Add missing return in error pathSjur Brændeland1-0/+1
Fix a missing return, causing access to freed memory. Signed-off-by: Sjur Brændeland <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lostPer Ellefsen1-2/+2
When receiving a piggyback'ed descriptor containing an embedded frame, but no payload, the embedded frame was lost. Signed-off-by: Per Ellefsen <[email protected]> Signed-off-by: Sjur Brændeland <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25caif: Clear shutdown mask to zero at reconnect.Sjur Brændeland1-0/+1
Clear caif sockets's shutdown mask at (re)connect. Signed-off-by: Sjur Brændeland <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25tcp: heed result of security_inet_conn_request() in tcp_v6_conn_request()Neal Cardwell1-1/+2
If security_inet_conn_request() returns non-zero then TCP/IPv6 should drop the request, just as in TCP/IPv4 and DCCP in both IPv4 and IPv6. Signed-off-by: Neal Cardwell <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25ipv6: fib: fix fib dump restartEric Dumazet1-2/+2
Commit 2bec5a369ee79576a3 (ipv6: fib: fix crash when changing large fib while dumping it) introduced ability to restart the dump at tree root, but failed to skip correctly a count of already dumped entries. Code didn't match Patrick intent. We must skip exactly the number of already dumped entries. Note that like other /proc/net files or netlink producers, we could still dump some duplicates entries. Reported-by: Debabrata Banerjee <[email protected]> Reported-by: Josh Hunt <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-25Merge branch 'v4l_for_linus' of ↵Linus Torvalds56-278/+220
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media Pull media fixes from Mauro Carvalho Chehab. Trivial conflict due to new USB HID ID's being added next to each other (Baanto vs Axentia). * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits) [media] smia: Fix compile failures [media] Fix VIDIOC_DQEVENT docbook entry [media] s5p-fimc: Fix control creation function [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file [media] s5p-mfc: Fix setting controls [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT [media] v4l/s5p-mfc: corrected encoder v4l control definitions [media] v4l: mem2mem_testdev: Fix race conditions in driver [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism [media] cxd2820r: Fix an incorrect modulation type bitmask [media] em28xx: Show a warning if the board does not support remote controls [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD [media] USB: Staging: media: lirc: initialize spinlocks before usage [media] Revert "[media] media: mx2_camera: Fix mbus format handling" [media] bw-qcam: driver and pixfmt documentation fixes [media] cx88: fix firmware load on big-endian systems [media] cx18: support big-endian systems [media] ivtv: fix support for big-endian systems [media] tuner-core: return the frequency range of the correct tuner [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls() ...
2012-06-25rcu: Stop rcu_do_batch() from multiplexing the "count" variablePaul E. McKenney1-7/+7
Commit b1420f1c (Make rcu_barrier() less disruptive) rearranged the code in rcu_do_batch(), moving the ->qlen manipulation to follow the requeueing of the callbacks. Unfortunately, this rearrangement clobbered the value of the "count" local variable before the value of rdp->qlen was adjusted, resulting in the value of rdp->qlen being inaccurate. This commit therefore introduces an index variable "i", avoiding the inadvertent multiplexing. Signed-off-by: Paul E. McKenney <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> Reviewed-by: Josh Triplett <[email protected]>
2012-06-25ALSA: hda - Add Realtek ALC280 codec supportDavid Henningsson1-0/+1
This chip looks very similar to ALC269 and ALC27* variants. The bug reporter has verified that sound was working after this patch had been applied. Cc: [email protected] BugLink: https://bugs.launchpad.net/bugs/1017017 Tested-by: Richard Crossley <[email protected]> Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-06-25printk: fix regression in SYSLOG_ACTION_CLEARAlan Stern1-0/+1
Commit 7ff9554bb578ba02166071d2d487b7fc7d860d62 (printk: convert byte-buffer to variable-length record buffer) introduced a regression by accidentally removing a "break" statement from inside the big switch in printk's do_syslog(). The symptom of this bug is that the "dmesg -C" command doesn't only clear the kernel's log buffer; it also disables console logging. This patch (as1561) fixes the regression by adding the missing "break". Signed-off-by: Alan Stern <[email protected]> CC: Kay Sievers <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-25stable: Allow merging of backports for serious user-visible performance issuesMel Gorman1-0/+6
Distribution kernel maintainers routinely backport fixes for users that were deemed important but not "something critical" as defined by the rules. To users of these kernels they are very serious and failing to fix them reduces the value of -stable. The problem is that the patches fixing these issues are often subtle and prone to regressions in other ways and need greater care and attention. To combat this, these "serious" backports should have a higher barrier to entry. This patch relaxes the rules to allow a distribution maintainer to merge to -stable a backported patch or small series that fixes a "serious" user-visible performance issue. They should include additional information on the user-visible bug affected and a link to the bugzilla entry if available. The same rules about the patch being already in mainline still apply. Signed-off-by: Mel Gorman <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-25Merge tag 'regulator-3.5' of ↵Linus Torvalds3-4/+7
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator Pull regulator fixes from Mark Brown: "A few small, driver specific bug fixes, nothing exciting here but all needed if you happen to be using the affected hardware." * tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: palmas: fix regmap offsets for enable/disable regulator: tps6524x: Fix get_voltage_sel for fixed voltage regulator: tps65023: Fix mask for LDOs output voltage select control
2012-06-25Merge branch 'fixes-for-linus' of ↵Linus Torvalds1-1/+1
git://git.linaro.org/people/mszyprowski/linux-dma-mapping Git pull DMA-mapping fix from Marek Szyprowski: "Another minor fixup for ARM dma-mapping redesign and extensions merged in this merge window" * 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: ARM: dma-mapping: fix buffer chunk allocation order
2012-06-25bug.h: Fix up CONFIG_BUG=n implicit function declarations.Paul Mundt1-10/+9
Commit 2603efa31a03 ("bug.h: Fix up powerpc build regression") corrected the powerpc build case and extended the __ASSEMBLY__ guards, but it also got caught in pre-processor hell accidentally matching the else case of CONFIG_BUG resulting in the BUG disabled case tripping up on -Werror=implicit-function-declaration. It's not possible to __ASSEMBLY__ guard the entire file as architecture code needs to get at the BUGFLAG_WARNING definition in the GENERIC_BUG case, but the rest of the CONFIG_BUG=y/n case needs to be guarded. Rather than littering endless __ASSEMBLY__ checks in each of the if/else cases we just move the BUGFLAG definitions up under their own GENERIC_BUG test and then shove everything else under one big __ASSEMBLY__ guard. Build tested on all of x86 CONFIG_BUG=y, CONFIG_BUG=n, powerpc (due to it's dependence on BUGFLAG definitions in assembly code), and sh (due to not bringing in linux/kernel.h to satisfy the taint flag definitions used by the generic bug code). Hopefully that's the end of the corner cases and I can abstain from ever having to touch this infernal header ever again. Reported-by: Fengguang Wu <[email protected]> Tested-by: Fengguang Wu <[email protected]> Acked-by: Randy Dunlap <[email protected]> Cc: Arnd Bergmann <[email protected]> Signed-off-by: Paul Mundt <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-06-25Merge 3.5-rc4 into usb-linusGreg Kroah-Hartman322-1194/+2236
This is needed to sync up with the previous USB changes that were merged in Linus's branch. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-25x86, cpufeature: Catch duplicate CPU feature stringsH. Peter Anvin1-5/+18
We had a case of duplicate CPU feature strings, a user space ABI violation, for almost two years. Make it a build error so that doesn't happen again. Link: http://lkml.kernel.org/r/[email protected] Cc: Jan Beulich <[email protected]> Cc: Jean Delvare <[email protected]>
2012-06-25x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERMH. Peter Anvin3-4/+4
It makes sense to label "Digital Thermal Sensor" as "DTS", but unfortunately the string "dts" was already used for "Debug Store", and /proc/cpuinfo is a user space ABI. Therefore, rename this to "dtherm". This conflict went into mainline via the hwmon tree without any x86 maintainer ack, and without any kind of hint in the subject. a4659053 x86/hwmon: fix initialization of coretemp Reported-by: Jean Delvare <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Cc: Jan Beulich <[email protected]> Cc: <[email protected]> v2.6.36..v3.4 Signed-off-by: H. Peter Anvin <[email protected]>
2012-06-25HID: Fix the generic Kconfig optionsHenrik Rydberg3-28/+25
The generic HID driver is obviously not a special driver, so move it outside of the special drivers menu. Explain the usage and make the default follow the HID setting. This should simplify migration from older kernels. While at it, remove the redundant HID_SUPPORT option and modify the HID and USB_HID entries to better explain the bus structure. Reported-by: Jan Beulich <[email protected]> Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2012-06-25hwmon: Update my e-mail addressGuenter Roeck4-4/+4
My old e-mail address won't be valid for much longer. Time to update it. Signed-off-by: Guenter Roeck <[email protected]> Acked-by: Jean Delvare <[email protected]>
2012-06-25HID: magicmouse: Correct report range of major / minor axesYufeng Shen1-2/+4
In patch "HID: magicmouse: Adjust major / minor axes to scale", touch_major and touch_minor axes are scaled by a factor of four when reported but the max touch_major/minor is not scaled accordingly. This patch scales the max touch_major/minor to be consistent with the reported value. Signed-off-by: Yufeng Shen <[email protected]> Acked-by: Henrik Rydberg <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2012-06-25ALSA: hda - Remove obsoleted CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKSTakashi Iwai1-13/+0
I simply forgot to remove this entry although all Realtek quirks have been dropped. Signed-off-by: Takashi Iwai <[email protected]>
2012-06-25ASoC: wm8994: remove duplicate codeJaroslav Kysela1-3/+0
It seems that the code duplication was added at a merge operation. Signed-off-by: Jaroslav Kysela <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-06-25ALSA: usb-audio: add BOSS GT-100 supportClemens Ladisch1-0/+30
Reported-by: John McFarland <[email protected]> Tested-by: John McFarland <[email protected]> Signed-off-by: Clemens Ladisch <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-06-25ALSA: hda - Update documentation for Realtek codecs model stringsTakashi Iwai1-2/+8
Signed-off-by: Takashi Iwai <[email protected]>
2012-06-25ALSA: hda - Remove suprefluous EAPD init verbs for ALC660vdTakashi Iwai1-11/+0
The EAPD on nodes 0x14 and 0x15 are initialized in alc_auto_setup_eapd(). Signed-off-by: Takashi Iwai <[email protected]>
2012-06-25ASoC: dwc: Bodge around continuing absence of clock API stubsMark Brown1-0/+1
The patches for stubbing out the generic clock API still haven't been applied so we need to either add ifdefs here or add a dependency until someone decides to actually apply them. Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-06-25ASoC: wm8996: Move register default configuration to I2C probeMark Brown1-151/+180
This gets the registers set up as early as possible, mainly useful for the GPIOs to ensure that they're in the correct mode. Signed-off-by: Mark Brown <[email protected]>
2012-06-25ASoC: wm8996: Inline wm8996_reset() and optimise cache-only usageMark Brown1-18/+13
There is only one caller and this allows us to cleanly leave the CODEC with the internal LDO powered down which is the default state we're looking for and means that we can robustly disable the register cache only when we either disable the LDO or power down the external regulators. Signed-off-by: Mark Brown <[email protected]>
2012-06-25ASoC: wm8996: Move regulator notifier callbacks into I2C levelMark Brown1-21/+20
Now that we're using regmap the cache is available here. Signed-off-by: Mark Brown <[email protected]>
2012-06-25ASoC: wm8904: Move register default setup into I2C probe()Mark Brown1-56/+55
Get it done as early as possible, it's neater and minimises the time the pins aren't configured as requested. Signed-off-by: Mark Brown <[email protected]>
2012-06-25ASoC: wm8904: Move regulator acquisition and device identification to I2CMark Brown1-61/+51
It's more idiomatic to have the resource allocation at this level. Signed-off-by: Mark Brown <[email protected]>
2012-06-25ASoC: wm8904: Rely entirely on the core for bias level managementMark Brown1-27/+3
Even though the WM8904 is able to use idle_bias_off during both probe and resume we were needlessly leaving the device in standby mode. Instead power the device down as soon as we've confirmed that we can talk to it and don't manage the bias level at all over suspend and resume, the core will take us down to our minimum power level. Signed-off-by: Mark Brown <[email protected]>
2012-06-25Merge tag 'v3.5-rc4' into for-3.6Mark Brown626-3042/+6577
Linux 3.5-rc4 contains some bug fixes which overlap with new features.
2012-06-25ASoC: dmaengine_pcm: fix typo in commentUwe Kleine-König1-1/+1
Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Mark Brown <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.