aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-04-19nfsd4: Fix filp leakOGAWA Hirofumi1-1/+1
23fcf2ec93fb8573a653408316af599939ff9a8e (nfsd4: fix oops on lock failure) The above patch breaks free path for stp->st_file. If stp was inserted into sop->so_stateids, we have to free stp->st_file refcount. Because stp->st_file refcount itself is taken whether or not any refcounts are taken on the stp->st_file->fi_fds[]. Signed-off-by: OGAWA Hirofumi <[email protected]> Cc: [email protected] Signed-off-by: J. Bruce Fields <[email protected]>
2011-04-19Merge branch 'for-linus' of ↵Linus Torvalds2-3/+5
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by allmodconfig
2011-04-19ath9k: fix the return value of ath_stoprecvFelix Fietkau1-1/+1
The patch 'ath9k_hw: fix stopping rx DMA during resets' added code to detect a condition where rx DMA was stopped, but the MAC failed to enter the idle state. This condition requires a hardware reset, however the return value of ath_stoprecv was 'true' in that case, which allowed it to skip the reset when issuing a fast channel change. Signed-off-by: Felix Fietkau <[email protected]> Reported-by: Paul Stewart <[email protected]> Cc: [email protected] Signed-off-by: John W. Linville <[email protected]>
2011-04-19[media] media: vb2: correct queue initialization orderMarek Szyprowski1-2/+1
q->memory entry is initialized to late, so if allocation of memory buffers fails, the buffers might not be freed correctly (q->memory is tested in __vb2_free_mem, which can be called before setting q->memory). Reported-by: Kamil Debski <[email protected]> Signed-off-by: Marek Szyprowski <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> CC: Pawel Osciak <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] media: vb2: fix incorrect v4l2_buffer->flags handlingMarek Szyprowski1-2/+10
Videobuf2 core assumes that driver doesn't set any buffer flags. This is correct for buffer state flags that videobuf2 manages, but the other flags like V4L2_BUF_FLAG_{KEY,P,B}FRAME, V4L2_BUF_FLAG_TIMECODE and V4L2_BUF_FLAG_INPUT should be passed from or to the driver. Reported-by: Jonghun Han <[email protected]> Signed-off-by: Marek Szyprowski <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> CC: Pawel Osciak <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] s5p-fimc: Add support for the buffer timestamps and sequenceSylwester Nawrocki1-0/+10
Add support for buffer timestamps and the sequence number in the video capture driver. Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] s5p-fimc: Fix bytesperline and plane payload setupSylwester Nawrocki2-16/+20
Make sure the sizeimage for 3-planar color formats is width * height * 3/2 and the bytesperline is same for each plane in case of a multi-planar format. Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] s5p-fimc: Do not allow changing format after REQBUFSSylwester Nawrocki2-3/+3
Protecting the color format with vb2_is_streaming() is not sufficient as this prevents changing the format only after VIDIOC_STREAMON. To prevent the color format reconfiguration as soon as buffers are allocated use vb2_is_busy() instead. Also make the videobuf queue ops structure static. Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] s5p-fimc: Fix FIMC3 pixel limits on Exynos4Sylwester Nawrocki1-11/+19
Correct pixel limits for the fourth FIMC entity on Exynos4 SoCs. FIMC3 only supports the writeback input from the LCD mixer. Also rename s5pv310 variant to exynos4 which is needed after renaming s5pv310 series to Exynos4. Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19Merge branch 'master' of ↵David S. Miller3-10/+30
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
2011-04-19Merge branch 'x86-fixes-for-linus' of ↵Linus Torvalds3-14/+21
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, gart: Make sure GART does not map physmem above 1TB x86, gart: Set DISTLBWALKPRB bit always x86, gart: Convert spaces to tabs in enable_gart_translation
2011-04-19Merge branch 'timer-fixes-for-linus' of ↵Linus Torvalds3-18/+13
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: RTC: rtc-omap: Fix a leak of the IRQ during init failure posix clocks: Replace mutex with reader/writer semaphore
2011-04-19Merge branch 'perf-fixes-for-linus' of ↵Linus Torvalds11-49/+64
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf, x86: Fix AMD family 15h FPU event constraints perf, x86: Fix pre-defined cache-misses event for AMD family 15h cpus perf evsel: Fix use of inherit perf hists browser: Fix seg fault when annotate null symbol
2011-04-19Revert "[media] V4L: videobuf, don't use dma addr as physical"Linus Torvalds1-1/+1
This reverts commit 35d9f510b67b10338161aba6229d4f55b4000f5b. Quoth Jiri Slaby: "It fixes mmap when IOMMU is used on x86 only, but breaks architectures like ARM or PPC where virt_to_phys(dma_alloc_coherent) doesn't work. We need there dma_mmap_coherent or similar (the trickery what snd_pcm_default_mmap does but in some saner way). But this cannot be done at this phase." Requested-by: Jiri Slaby <[email protected]> Cc: Russell King - ARM Linux <[email protected]> Cc: Janusz Krzysztofik <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-04-19Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixesLinus Torvalds9-34/+111
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: filesystem hang caused by incorrect lock order GFS2: Don't try to deallocate unlinked inodes when mounted ro GFS2: directly write blocks past i_size GFS2: write_end error path fails to unlock transaction lock
2011-04-19OMAP2+: hwmod data: Fix wrong dma_system end addressBenoit Cousson4-4/+4
OMAP2420, 2430 and 3xxx were using the OMAP4 end address that unfortunately is not located at the same base address. Moreover the OMAP4 size was set to 256 instead of 4096. Change all .pa_end to set them to .pa_start + 0xfff Cc: "G, Manjunath Kondaiah" <[email protected]> Cc: Benoit Cousson <[email protected]> Reported-by: Michael Fillinger <[email protected]> Signed-off-by: Benoit Cousson <[email protected]> Signed-off-by: Paul Walmsley <[email protected]>
2011-04-19hwmon: (max34440) Add driver documentationGuenter Roeck2-10/+79
MAX34440 and MAX34441 have their own driver, thus there should be explicit documentation instead of mentioning the chips in the generic PMBus driver documentation. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-04-19hwmon: (max16064) Add driver documentationGuenter Roeck2-5/+62
MAX16064 has its own driver, thus should have its own documentation instead of being mentioned in the generic PMBus driver documentation. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-04-19hwmon: (max8688) Add driver documentationGuenter Roeck2-5/+69
MAX8688 has its own driver, thus should have its own documentation instead of being mentioned in the generic PMBus driver documentation. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-04-19hwmon: (pmbus) Documentation updatesGuenter Roeck1-6/+8
Fix spelling, correct label name error, and add missing attribute to PMBus driver documentation. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-04-19hwmon: (smm665) Fix spelling error in driver documentationGuenter Roeck1-4/+4
tempererature may sound interesting, but temperature is still preferred. Signed-off-by: Guenter Roeck <[email protected]> Acked-by: Jean Delvare <[email protected]>
2011-04-19hwmon: (pmbus) Removed unused variable from struct pmbus_dataGuenter Roeck1-1/+0
struct pmbus_data included an unused variable named status_bits. Remove it. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-04-19hwmon: Add submitting-patches checklist to documentationGuenter Roeck1-0/+109
When writing hardware monitoring drivers, there are some common pitfalls which keep coming up in code reviews. This patch provides a document describing all those pitfalls and how to avoid them. Signed-off-by: Guenter Roeck <[email protected]> Acked-by: Jean Delvare <[email protected]>
2011-04-19ALSA: hda - Add a fix-up for Acer dmic with ALC271x codecTakashi Iwai1-1/+24
Acer laptops with ALC271x needs a magic initialization for digital-mic to make it working with mono streams (and PulseAudio). Added a fix-up applied to Acer with ALC271x generically. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-04-19[media] tda18271: update tda18271c2_rf_cal as per NXP's rev.04 datasheetMichael Krufky1-4/+5
Cc: Stefan Sibiga <[email protected]> Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] tda18271: update tda18271_rf_band as per NXP's rev.04 datasheetMichael Krufky1-2/+1
Cc: Stefan Sibiga <[email protected]> Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] tda18271: fix bad calculation of main post divider byteMichael Krufky1-10/+1
R_MPD bit 3 does not depend on analog vs. digital. Just use (0x7f & pd) directly from the values in the main pll table. Thanks to Stefan Sibiga for pointing this out. Cc: Stefan Sibiga <[email protected]> Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] tda18271: prog_cal and prog_tab variables should be s32, not u8Michael Krufky1-10/+11
Fix type of prog_cal and prog_tab variables to avoid any possible calculation errors. Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] tda18271: fix calculation bug in tda18271_rf_tracking_filters_initMichael Krufky1-4/+4
Misplaced parenthesis cause a calculation bug in tda18271_rf_tracking_filters_init Thanks to Stefan Sibiga for pointing this out. Cc: Stefan Sibiga <[email protected]> Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] omap3isp: queue: Don't corrupt buf->npages when get_user_pages() failsLaurent Pinchart1-1/+1
get_user_pages() can return a negative error code when it fails. Set buf->npages to 0 in that case, to prevent isp_video_buffer_cleanup() from releasing invalid pages. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] v4l: Don't register media entities for subdev device nodesLaurent Pinchart1-5/+10
Subdevs already have their own entity, don't register as second one when registering the subdev device node. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Sakari Ailus <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] omap3isp: Don't increment node entity use count when poweron failsLaurent Pinchart1-0/+2
When open a device node, all entities part of the same pipeline are powered on. If one of the entities fails to be powered on, the open operations fails. In that case the device node entity use count must not be incremented. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] omap3isp: lane shifter supportMichael Jones5-30/+120
To use the lane shifter, set different pixel formats at each end of the link at the CCDC input. Signed-off-by: Michael Jones <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] omap3isp: ccdc: support Y10/12, 8-bit bayer fmtsMichael Jones2-0/+18
Add support for 8-bit bayer and 10- and 12-bit grey formats at the CCDC input. Y12 is truncated to Y10 at the CCDC output. Signed-off-by: Michael Jones <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] media: add missing 8-bit bayer formats and Y12Michael Jones2-2/+64
8-bit SGBRG and SRGGB media bus formats are missing, as well as the 12-bit grey format. Add them. Signed-off-by: Michael Jones <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19[media] v4l: add V4L2_PIX_FMT_Y12 formatMichael Jones4-0/+82
Y12 is a grey-scale format with a depth of 12 bits per pixel stored in 16-bit words. Signed-off-by: Michael Jones <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-04-19netfilter: ipset: Fix the order of listing of setsJozsef Kadlecsik1-8/+10
A restoreable saving of sets requires that list:set type of sets come last and the code part which should have taken into account the ordering was broken. The patch fixes the listing order. Signed-off-by: Jozsef Kadlecsik <[email protected]> Signed-off-by: Patrick McHardy <[email protected]>
2011-04-19block: Remove the extra check in queue_requests_storeTao Ma1-2/+2
In queue_requests_store, the code looks like if (rl->count[BLK_RW_SYNC] >= q->nr_requests) { blk_set_queue_full(q, BLK_RW_SYNC); } else if (rl->count[BLK_RW_SYNC]+1 <= q->nr_requests) { blk_clear_queue_full(q, BLK_RW_SYNC); wake_up(&rl->wait[BLK_RW_SYNC]); } If we don't satify the situation of "if", we can get that rl->count[BLK_RW_SYNC} < q->nr_quests. It is the same as rl->count[BLK_RW_SYNC]+1 <= q->nr_requests. All the "else" should satisfy the "else if" check so it isn't needed actually. Signed-off-by: Tao Ma <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2011-04-19block, blk-sysfs: Fix an err return path in blk_register_queue()Liu Yuan1-1/+3
We do not call blk_trace_remove_sysfs() in err return path if kobject_add() fails. This path fixes it. Cc: [email protected] Signed-off-by: Liu Yuan <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2011-04-19block: remove stale kerneldoc member from __blk_run_queue()Jens Axboe1-1/+0
We don't pass in a 'force_kblockd' anymore, get rid of the stsale comment. Reported-by: Mike Snitzer <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2011-04-19block: get rid of QUEUE_FLAG_REENTERJens Axboe5-54/+20
We are currently using this flag to check whether it's safe to call into ->request_fn(). If it is set, we punt to kblockd. But we get a lot of false positives and excessive punts to kblockd, which hurts performance. The only real abuser of this infrastructure is SCSI. So export the async queue run and convert SCSI over to use that. There's room for improvement in that SCSI need not always use the async call, but this fixes our performance issue and they can fix that up in due time. Signed-off-by: Jens Axboe <[email protected]>
2011-04-19perf, x86: Fix AMD family 15h FPU event constraintsRobert Richter1-3/+17
Depending on the unit mask settings some FPU events may be scheduled only on cpu counter #3. This patch fixes this. Signed-off-by: Robert Richter <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2011-04-19perf, x86: Fix pre-defined cache-misses event for AMD family 15h cpusAndre Przywara1-1/+1
With AMD cpu family 15h a unit mask was introduced for the Data Cache Miss event (0x041/L1-dcache-load-misses). We need to enable bit 0 (first data cache miss or streaming store to a 64 B cache line) of this mask to proper count data cache misses. Now we set this bit for all families and models. In case a PMU does not implement a unit mask for event 0x041 the bit is ignored. Signed-off-by: Andre Przywara <[email protected]> Signed-off-by: Robert Richter <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2011-04-19cfq-iosched: read_lock() does not always imply rcu_read_lock()Jens Axboe1-14/+6
For some configurations of CONFIG_PREEMPT that is not true. So get rid of __call_for_each_cic() and always uses the explicitly rcu_read_lock() protected call_for_each_cic() instead. This fixes a potential bug related to IO scheduler removal or online switching. Thanks to Paul McKenney for clarifying this. Signed-off-by: Jens Axboe <[email protected]>
2011-04-18Linux 2.6.39-rc4Linus Torvalds1-1/+1
2011-04-18Bluetooth: Only keeping SAR bits when retransmitting one frame.Ruiyi Zhang1-0/+1
When retrasmitting one frame, only SAR bits in control field should be kept. Signed-off-by: Ruiyi Zhang <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-18Bluetooth: fix shutdown on SCO socketsLuiz Augusto von Dentz1-0/+9
shutdown should wait for SCO link to be properly disconnected before detroying the socket, otherwise an application using the socket may assume link is properly disconnected before it really happens which can be a problem when e.g synchronizing profile switch. Signed-off-by: Luiz Augusto von Dentz <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-18Bluetooth: Fix keeping the command timer runningVinicius Costa Gomes1-3/+2
In the teardown path the reset command is sent to the controller, this event causes the command timer to be reactivated. So the timer is removed in two situations, when the adapter isn't marked as UP and when we know that some command has been sent. Reported-by: Keith Packard <[email protected]> Signed-off-by: Vinicius Costa Gomes <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-18Bluetooth: Fix refcount balance for hci connectionVille Tervo1-2/+0
hci_io_capa_reply_evt() holds reference for hciconnection. It's useless since hci_io_capa_request_evt()/hci_simple_pair_complete_evt() already protects the connection. In addition it leaves connection open after failed SSP pairing. Signed-off-by: Ville Tervo <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-04-18Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msmLinus Torvalds2-5/+2
* 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm: msm: timer: fix missing return value msm: Remove extraneous ffa device check
Powered by cgit, Gruvboxed by Blaster4385.