diff options
author | Praneeth Bajjuri | 2013-04-16 17:52:14 -0500 |
---|---|---|
committer | Praneeth Bajjuri | 2013-04-16 17:52:14 -0500 |
commit | 79b8cdc3f1d584ba364133a5995755e2e5913368 (patch) | |
tree | e3bbf01b0601c6c1e0c0f80df17fbc5ddbe22c95 /block | |
parent | dfb23ecfcb8a7f9d5b5555edcf6369a162d4397c (diff) | |
parent | 19a56e50a91f875597920d593060c4e81d7a2838 (diff) | |
download | kernel-video-79b8cdc3f1d584ba364133a5995755e2e5913368.tar.gz kernel-video-79b8cdc3f1d584ba364133a5995755e2e5913368.tar.xz kernel-video-79b8cdc3f1d584ba364133a5995755e2e5913368.zip |
Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y
* origin/p-ti-linux-3.8.y: (114 commits)
drm.h: Fix DRM compilation with bare-metal toolchain
Revert "ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module"
mmc:fix max discard sectors limit
arm: configs: disable unused sata configs
ARM: dts: omap3-beagle-xm: Add USB Host support
dmaengine: OMAP: Register SDMA controller with Device Tree DMA driver
ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx
USB: ehci-omap: Fix stale dma_mask on repeated modprobe/rmmod
ARM: omap2plus_defconfig: Enable USB Video class drivers
usb: dwc3: set 'mode' based on selected Kconfig choices
usb: dwc3: remove dwc3 dependency on host AND gadget.
drivers: usb: otg: palmas: enable VBUS on ID connect interrupt
drivers: regulator: palmas: add an API to set/clear the switch bit on SMPS10
usb: dwc3: gadget: free trb pool only from epnum 2
ARM: OMAP: Display: Fix compile issues
ARM: DTS: OMAP5-uevm: pull-up Palmas MSECURE line
ARM/dts: omap5-sevm: Enable palmas on i2c1 bus
ARM: OMAP2+: omap2plus_defconfig: Enable RTC support
ARM: dts: AM33XX: Enable system power off control in am335x-bone
ARM: dts: AM33XX: Set pmic-shutdown-controller for BeagleBone
...
Conflicts:
drivers/hid/hid-magicmouse.c
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-settings.c | 3 | ||||
-rw-r--r-- | block/blk-sysfs.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index c50ecf0ea3b..34e6b618fe0 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
@@ -283,7 +283,8 @@ EXPORT_SYMBOL(blk_queue_max_hw_sectors); | |||
283 | void blk_queue_max_discard_sectors(struct request_queue *q, | 283 | void blk_queue_max_discard_sectors(struct request_queue *q, |
284 | unsigned int max_discard_sectors) | 284 | unsigned int max_discard_sectors) |
285 | { | 285 | { |
286 | q->limits.max_discard_sectors = max_discard_sectors; | 286 | q->limits.max_discard_sectors = min_t(unsigned int, max_discard_sectors, |
287 | BLK_DEF_MAX_DISCARD_SECTORS); | ||
287 | } | 288 | } |
288 | EXPORT_SYMBOL(blk_queue_max_discard_sectors); | 289 | EXPORT_SYMBOL(blk_queue_max_discard_sectors); |
289 | 290 | ||
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 788147797a7..6d2f7c0408b 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c | |||
@@ -229,6 +229,8 @@ queue_store_##name(struct request_queue *q, const char *page, size_t count) \ | |||
229 | unsigned long val; \ | 229 | unsigned long val; \ |
230 | ssize_t ret; \ | 230 | ssize_t ret; \ |
231 | ret = queue_var_store(&val, page, count); \ | 231 | ret = queue_var_store(&val, page, count); \ |
232 | if (ret < 0) \ | ||
233 | return ret; \ | ||
232 | if (neg) \ | 234 | if (neg) \ |
233 | val = !val; \ | 235 | val = !val; \ |
234 | \ | 236 | \ |