summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-24Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown1-48/+16
2013-10-24Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown3-18/+11
2013-10-24Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown1-3/+21
2013-10-24Merge remote-tracking branch 'asoc/topic/rcar' into asoc-nextMark Brown10-185/+326
2013-10-24Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown13-48/+46
2013-10-24Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-nextMark Brown1-0/+1
2013-10-24Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-nextMark Brown1-0/+1
2013-10-24Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown4-22/+40
2013-10-24Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown4-61/+91
2013-10-24Merge remote-tracking branch 'asoc/topic/max9850' into asoc-nextMark Brown1-10/+29
2013-10-24Merge remote-tracking branch 'asoc/topic/max98095' into asoc-nextMark Brown1-296/+170
2013-10-24Merge remote-tracking branch 'asoc/topic/max98088' into asoc-nextMark Brown1-351/+273
2013-10-24Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown5-27/+93
2013-10-24Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown7-24/+17
2013-10-24Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown1-1/+1
2013-10-24Merge remote-tracking branch 'asoc/topic/doc' into asoc-nextMark Brown5-66/+456
2013-10-24Merge remote-tracking branch 'asoc/topic/dma' into asoc-nextMark Brown7-28/+115
2013-10-24Merge remote-tracking branch 'asoc/topic/devm' into asoc-nextMark Brown12-52/+108
2013-10-24Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown8-91/+382
2013-10-24Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown8-85/+279
2013-10-24Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-nextMark Brown4-90/+173
2013-10-24Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown1-0/+1
2013-10-24Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-nextMark Brown1-32/+14
2013-10-24Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown7-357/+100
2013-10-24Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown2-104/+174
2013-10-24Merge remote-tracking branch 'asoc/topic/bclk' into asoc-nextMark Brown2-0/+19
2013-10-24Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown3-9/+2
2013-10-24Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown1-9/+14
2013-10-24Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown1-2/+0
2013-10-24Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown1-3/+8
2013-10-24Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-nextMark Brown1-45/+102
2013-10-24Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-nextMark Brown1-61/+237
2013-10-24Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-nextMark Brown1-41/+37
2013-10-24Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-nextMark Brown2-121/+71
2013-10-24Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linusMark Brown1-0/+4
2013-10-24Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linusMark Brown2-2/+3
2013-10-24Merge remote-tracking branch 'asoc/fix/pcm1792a' into asoc-linusMark Brown1-1/+1
2013-10-24Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linusMark Brown1-1/+1
2013-10-24Merge remote-tracking branch 'asoc/fix/omap' into asoc-linusMark Brown1-2/+2
2013-10-24Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linusMark Brown4-13/+16
2013-10-24ASoC: fsl: Add missing pm to current machine driversNicolin Chen3-0/+3
Add missing pm to current machine drivers so that all of them would correctly do suspend/resume. Signed-off-by: Nicolin Chen <b42378@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-10-24ASoC: dmaengine: Use filter_data rather than dma_data for compat requestsMark Brown2-4/+5
When using the legacy filter function channel requests we currently pass the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to be helpful for actual filtering. Since there's already a field in the structure called filter_data clearly intended for use here convert the driver to use that. All existing users of plain filter functions have been converted to use an explicit compat function to override this behaviour except i.MX which is working around this issue in its filter function and is updated to just use filter_data directly here. Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
2013-10-24ASoC: dmaengine: Support custom channel namesMark Brown2-1/+18
Some devices have more than just simple TX and RX DMA channels, for example modern Samsung I2S IPs support a secondary transmit DMA stream which is mixed into the primary stream during playback. Allow such devices to specify the names of the channels to be requested in their dma_data. Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
2013-10-24target: Fail XCOPY for non matching source + destination block_sizeNicholas Bellinger1-1/+13
This patch adds an explicit check + failure for XCOPY I/O to source + destination devices with a non-matching block_size. This limitiation is currently due to the fact that the scatterlist memory allocated for the XCOPY READ operation is passed zero-copy to the XCOPY WRITE operation. Reported-by: Thomas Glanzmann <thomas@glanzmann.de> Reported-by: Douglas Gilbert <dgilbert@interlog.com> Cc: Thomas Glanzmann <thomas@glanzmann.de> Cc: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
2013-10-24target: Generate failure for XCOPY I/O with non-zero scsi_statusNicholas Bellinger1-1/+2
This patch adds the missing non-zero se_cmd->scsi_status check required for local XCOPY I/O within target_xcopy_issue_pt_cmd() to signal an exception case failure. This will trigger the generation of SAM_STAT_CHECK_CONDITION status from within target_xcopy_do_work() process context code. Reported-by: Thomas Glanzmann <thomas@glanzmann.de> Reported-by: Douglas Gilbert <dgilbert@interlog.com> Cc: Thomas Glanzmann <thomas@glanzmann.de> Cc: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
2013-10-24target: Add missing XCOPY I/O operation sense_bufferNicholas Bellinger1-2/+3
This patch adds the missing xcopy_pt_cmd->sense_buffer[] required for correctly handling CHECK_CONDITION exceptions within the locally generated XCOPY I/O path. Also update target_xcopy_read_source() + target_xcopy_setup_pt_cmd() to pass this buffer into transport_init_se_cmd() to correctly setup se_cmd->sense_buffer. Reported-by: Thomas Glanzmann <thomas@glanzmann.de> Reported-by: Douglas Gilbert <dgilbert@interlog.com> Cc: Thomas Glanzmann <thomas@glanzmann.de> Cc: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
2013-10-24ALSA: hda - Fix unbalanced runtime PM refcount after S3/S4Takashi Iwai1-2/+2
When a machine goes to S3/S4 after power-save is enabled, the runtime PM refcount might be incorrectly decreased because the power-down triggered soon after resume assumes that the controller was already powered up, and issues the pm_notify down. This patch fixes the incorrect pm_notify call simply by checking the current value properly. Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-10-24Merge tag 'md/3.12-fixes' of git://neil.brown.name/mdLinus Torvalds4-2/+25
Pull md bugfixes from Neil Brown: "Assorted md bug-fixes for 3.12. All tagged for -stable releases too" * tag 'md/3.12-fixes' of git://neil.brown.name/md: raid5: avoid finding "discard" stripe raid5: set bio bi_vcnt 0 for discard request md: avoid deadlock when md_set_badblocks. md: Fix skipping recovery for read-only arrays.
2013-10-24Merge tag 'scsi-fixes' of ↵Linus Torvalds4-10/+19
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI fixes from James Bottomley: "This is a set of two fixes which cause oopses (Buslogic, qla2xxx) and one fix which may cause a hang because of request miscounting (sd)" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: [SCSI] sd: call blk_pm_runtime_init before add_disk [SCSI] qla2xxx: Fix request queue null dereference. [SCSI] BusLogic: Fix an oops when intializing multimaster adapter
2013-10-24iser-target: check device before dereferencing its variableVu Pham1-1/+1
This patch changes isert_connect_release() to correctly check for the existence struct isert_device *device before checking for isert_device->use_frwr. Signed-off-by: Vu Pham <vu@mellanox.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>