aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-05-04drm/radeon/kms: add some new pci idsAlex Deucher1-0/+5
Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2011-05-03logfs: initialize superblock entries earlierLinus Torvalds1-4/+4
In particular, s_freeing_list needs to be initialized early, since it is used on some of the error paths when mounts fail. The mapping inode, for example, would be initialized and then free'd on an error path before s_freeing_list was initialized, but the inode drop operation needs the s_freeing_list to be set up. Normally you'd never see this, because not only is logfs fairly rare, but a successful mount will never have any issues. Reported-by: werner <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-03Merge branch 'for-2.6.39' into for-2.6.40Mark Brown2-0/+8
2011-05-03ASoC: sst_platform: add hw_free callback to fix resource leakxingchao1-0/+6
Signed-off-by: xingchao <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: Remove outdated FIXME from WM8915Mark Brown1-1/+0
Actually the current code is perfectly sensible given the hardware. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-05-03ASoC: Use shared controls for input signal path in WM8915Mark Brown1-20/+25
Gives finer grained power management. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-05-03Merge branch 'topic/asoc' of ↵Mark Brown1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.40
2011-05-03ASoC: Don't crash on PM operationsMark Brown1-0/+2
The move over to exposing snd_soc_register_card() let the initialisation of the driver data we use to find the card in PM operations go AWOL. Fix this by setting the driver data when we register the card. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-05-03[SCSI] fix oops in scsi_run_queue()James Bottomley1-1/+6
The recent commit closing the race window in device teardown: commit 86cbfb5607d4b81b1a993ff689bbd2addd5d3a9b Author: James Bottomley <[email protected]> Date: Fri Apr 22 10:39:59 2011 -0500 [SCSI] put stricter guards on queue dead checks is causing a potential NULL deref in scsi_run_queue() because the q->queuedata may already be NULL by the time this function is called. Since we shouldn't be running a queue that is being torn down, simply add a NULL check in scsi_run_queue() to forestall this. Tested-by: Jim Schutt <[email protected]> Cc: [email protected] Signed-off-by: James Bottomley <[email protected]>
2011-05-03staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.cHarry Wei1-1/+1
Hi us, When i was compiling kernel, a warning happened to me. The warning said like following. drivers/staging/wlan-ng/cfg80211.c:709: warning: initialization from incompatible pointer type. See http://s1202.photobucket.com/albums/bb364/harrywei/?action=view&current=patched2.png for more details. So i patch like following. Signed-off-by: Harry Wei <[email protected]> Acked-by: Randy Dunlap <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-05-03ASoC: Implement mux control sharingStephen Warren1-31/+75
Control sharing is enabled when two widgets include pointers to the same kcontrol_new in their definition. Specifically: static const struct snd_kcontrol_new adcinput_mux = SOC_DAPM_ENUM("ADC Input", adcinput_enum); static const struct snd_soc_dapm_widget wm8903_dapm_widgets[] = { SND_SOC_DAPM_MUX("Left ADC Input", SND_SOC_NOPM, 0, 0, &adcinput_mux), SND_SOC_DAPM_MUX("Right ADC Input", SND_SOC_NOPM, 0, 0, &adcinput_mux), }; This is useful when a single register bit or field affects multiple muxes at once. The common case is to have separate control bits or fields for each mux (channel). An alternative way of looking at this is that the mux is a stereo (or even n-channel) mux, rather than independant mono muxes. Without this change, a separate kcontrol will be created for each DAPM_MUX. This has the following disadvantages: * Confuses the user/programmer with redundant controls that don't map to separate hardware. * When one of the controls is changed, ASoC fails to update the DAPM logic for paths solely affected by the other controls impacted by the same register bits. This causes some paths not to be correctly powered up or down. Prior to this change, to work around this, the user or programmer had to manually toggle all duplicate controls away from the intended setting, and then back to it. Control sharing implies that the control is named based on the kcontrol_new itself, not any of the widgets that are affected by it. Control sharing is implemented by: When creating kcontrols, if a kcontrol does not yet exist for a particular kcontrol_new, then a new kcontrol is created with a list of widgets containing just a single entry. This is the normal case. However, if a kcontrol does already exists for the given kcontrol_new, the current widget is simply added to that kcontrol's list of affected widgets. Signed-off-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: Store a list of widgets in a DAPM mux/mixer kcontrolStephen Warren2-56/+137
A future change will allow multiple widgets to be affected by the same control. For example, a single register bit that controls separate muxes in both the L and R audio paths. This change updates the code that handles relevant controls to be able to iterate over a list of affected widgets. Note that only the put functions need significant modification to implement the iteration; the get functions do not need to iterate, nor unify the results, since all affected widgets reference the same kcontrol. When creating the list of widgets, always create a 1-sized list, since the control sharing is not implemented in this change. Signed-off-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: Add w->kcontrols, and populate itStephen Warren2-0/+13
Future changes will need reference to the kcontrol created for a given kcontrol_new. Store the created kcontrol values now. Signed-off-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: s/w->kcontrols/w->kcontrol_news/gStephen Warren3-48/+50
A future change will modify struct snd_soc_dapm_widget to store the actual kcontrol pointers for each kcontrol_new in a field named kcontrols. Rename the existing kcontrols field to enable this. Signed-off-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03xHCI: Clear PLC in xhci_bus_resume()Andiry Xu1-2/+17
This patch clears PORT_PLC if xhci_bus_resume() resumes a previous suspended port, because if a port transition from U3 to U0 state, it will report a port link state change, and software should clear the corresponding PLC bit. It also uses hcd->speed to check if a port is a USB2 protocol port. The patch fixes the issue that USB keyboard can not wakeup system from hibernation. Signed-off-by: Andiry Xu <[email protected]> Signed-off-by: Sarah Sharp <[email protected]>
2011-05-03Merge branch 'for-2.6.39' into for-2.6.40Mark Brown1-1/+1
2011-05-03ASoC: JZ4740: Fix i2s shutdownLars-Peter Clausen1-1/+1
The i2s shutdown callback has the check whether it should be disabled reversed. Currently it is disabled if another stream is still active, but kept enabled if the last stream is closed. This patch fixes it. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: Remove DAPM debugfs entries before freeing widgetsLars-Peter Clausen1-0/+10
Remove the DAPM debugfs entries before freeing the context's widgets, otherwise a use after free situation might occur. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: Move DAPM widget debugfs entry creation to snd_soc_dapm_new_widgetsLars-Peter Clausen2-18/+30
Currently debugfs entries for a DAPM widgets are only added in snd_soc_dapm_debugfs_init. If a widget is added later (for example in the dai_link's probe callback) it will not show up in debugfs. This patch moves the creation of the widget debugfs entry to snd_soc_dapm_new_widgets where it will be added after the widget has been properly instantiated. As a side-effect this will also reduce the number of times the DAPM widget list is iterated during a card's instantiation. Since it is possible that snd_soc_dapm_new_widgets is invoked form the codecs or cards probe callbacks, the creation of the debugfs dapm directory has to be moved before these are called. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: Move DAPM debugfs directory creation to snd_soc_dapm_debugfs_initLars-Peter Clausen3-18/+14
Move the creation of the DAPM debugfs directory to snd_soc_dapm_debugfs_init instead of having the same duplicated code in both codec and card DAPM setup. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: Free the card's DAPM contextLars-Peter Clausen1-0/+2
Free the card's DAPM context when the card is removed. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ASoC: tegra: TrimSlice machine supportMike Rapoport3-0/+238
Signed-off-by: Mike Rapoport <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-03ALSA: lola - Yet another linux/delay.h inclusionTakashi Iwai1-0/+1
Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03libceph: fix ceph_osdc_alloc_request error checksSage Weil2-4/+4
ceph_osdc_alloc_request returns NULL on failure. Signed-off-by: Sage Weil <[email protected]>
2011-05-03ceph: handle ceph_osdc_new_request failure in ceph_writepages_startHenry C Chang1-0/+7
We should unlock the page and return -ENOMEM if ceph_osdc_new_request failed. Signed-off-by: Henry C Chang <[email protected]> Signed-off-by: Sage Weil <[email protected]>
2011-05-03libceph: fix ceph_msg_new error pathHenry C Chang1-13/+13
If memory allocation failed, calling ceph_msg_put() will cause GPF since some of ceph_msg variables are not initialized first. Fix Bug #970. Signed-off-by: Henry C Chang <[email protected]> Signed-off-by: Sage Weil <[email protected]>
2011-05-03ceph: use ihold() when i_lock is heldSage Weil1-2/+2
See 0444d76ae64fffc7851797fc1b6ebdbb44ac504a. Signed-off-by: Sage Weil <[email protected]>
2011-05-03Merge branch 'stable/bug-fixes-for-rc5' of ↵Linus Torvalds1-1/+124
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: mask_rw_pte mark RO all pagetable pages up to pgt_buf_top xen/mmu: Add workaround "x86-64, mm: Put early page table high"
2011-05-03Merge branch 'for-linus' of ↵Linus Torvalds7-13/+20
git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finish mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finish mmc: tmio: fix .set_ios(MMC_POWER_UP) handling mmc: fix a race between card-detect rescan and clock-gate work instances mmc: omap: Fix possible NULL pointer deref mmc: core: mmc_add_card(): fix missing break in switch statement mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
2011-05-03Merge branches 'x86-fixes-for-linus' and 'irq-fixes-for-linus' of ↵Linus Torvalds4-9/+9
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, reboot: Fix relocations in reboot_32.S x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo() x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVEL
2011-05-03ALSA: lola - Add missing inclusion of linux/delay.hTakashi Iwai1-0/+1
Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Implement polling_mode like hd-audioTakashi Iwai2-3/+14
Also protect the call of lola_update_rirb() with spinlock. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Rename to Digital SRC Capture SwitchTakashi Iwai3-3/+17
Renamed to Digial SRC Capture Switch for more correct representation. Also fixed analog volume control on Lola161611 and lola881. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Add sync in loop implementationTakashi Iwai1-17/+59
For assuring the synchronized state with the pause operation, loop over the all linked streams and waits until all get ready in a loop. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Add SRC refcountingTakashi Iwai2-7/+46
Added the refcounting for the exclusive SRC control. Also, fixed the possible stall after PCM pause operations. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Allow granularity changesTakashi Iwai3-7/+27
Add some sanity checks. Change PCM parameters appropriately per granularity. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Use SG-bufferTakashi Iwai2-23/+4
Completely switch to SG-buffer now, as it's working stably. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Add Lola-specific module optionsTakashi Iwai1-10/+35
Added granularity and sample_rate_min module options. The former controls the h/w access granularity. As default, it's set to the max value 32. The latter controls the minimum sample rate in Hz, as default 16000. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Fix PCM stallsTakashi Iwai3-47/+74
Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Use a single BDLTakashi Iwai2-31/+49
Use a single BDL for both buffers instead of allocating for each. Also a few tune-up to avoid the stream stalls in the PCM code and the prelimianry work for SG-buffer support are added, too. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Suppress the debug printTakashi Iwai1-4/+4
Use snd_printdd() for less important debug messages. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Changes in proc fileTakashi Iwai1-6/+142
The codec proc file becomes a read only that shows the codec widgets in a text form. A new proc file, codec_rw, is introduced instead for accessing the Lola verb directly by reading and writing to it. Also, regs proc file shows the contents of DSD, too. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: lola - Make SRC helper globalTakashi Iwai2-4/+5
Make lola_sample_rate_convert() global so that it can be accessed from other files. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: Add the driver for Digigram Lola PCI-e boardsTakashi Iwai10-0/+3112
Added a new driver for supporting Digigram Lola PCI-e boards. Lola has a similar h/w design like HD-audio but with extended verbs. Thus the driver is written similarly like HD-audio driver in the bus part. The codec part is rather written in a fixed way specific to the Lola board because of the verb incompatibility. The driver provides basic PCM, supporting multi-streams and mixing. Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ASoC: Declare const properly for enum textsTakashi Iwai1-1/+1
The enum texts are supposed to be const char * const []. Without the second const, it gets compile warnings like sound/soc/codecs/max98095.c:607:2: warning: initialization discards qualifiers from pointer target type Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03ALSA: hda - fix NULL-dereference in patch_realtekRaymond Yau1-1/+1
Fix NULL-dereference when try to use alt_playback since those codecs which support multistreaming playback usually have more than 1 adc but the driver should create alt_capture when spec->stream_analog_alt_capture is also defined. Signed-off-by: Raymond Yau <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-05-03cifs: handle errors from coalesce_t2Jeff Layton1-3/+7
cifs_demultiplex_thread calls coalesce_t2 to try and merge follow-on t2 responses into the original mid buffer. coalesce_t2 however can return errors, but the caller doesn't handle that situation properly. Fix the thread to treat such a case as it would a malformed packet. Mark the mid as being malformed and issue the callback. Cc: [email protected] Acked-by: David Howells <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-05-03cifs: refactor mid finding loop in cifs_demultiplex_threadJeff Layton1-46/+46
...to reduce the extreme indentation. This should introduce no behavioral changes. Cc: [email protected] Acked-by: David Howells <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-05-02Merge branch 'for-linus' of ↵Linus Torvalds2-11/+66
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wm831x-ts - move BTN_TOUCH reporting to data transfer Input: wm831x-ts - allow IRQ flags to be specified Input: wm831x-ts - fix races with IRQ management
2011-05-02Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds51-134/+338
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits) sysctl: net: call unregister_net_sysctl_table where needed Revert: veth: remove unneeded ifname code from veth_newlink() smsc95xx: fix reset check tg3: Fix failure to enable WoL by default when possible networking: inappropriate ioctl operation should return ENOTTY amd8111e: trivial typo spelling: Negotitate -> Negotiate ipv4: don't spam dmesg with "Using LC-trie" messages af_unix: Only allow recv on connected seqpacket sockets. mii: add support of pause frames in mii_get_an net: ftmac100: fix scheduling while atomic during PHY link status change usbnet: Transfer of maintainership usbnet: add support for some Huawei modems with cdc-ether ports bnx2: cancel timer on device removal iwl4965: fix "Received BA when not expected" iwlagn: fix "Received BA when not expected" dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085 usbnet: Resubmit interrupt URB if device is open iwl4965: fix "TX Power requested while scanning" iwlegacy: led stay solid on when no traffic b43: trivial: update module info about ucode16_mimo firmware ...
Powered by cgit, Gruvboxed by Blaster4385.