Merge branch 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (2 commits)
  ARM: EXYNOS: Add cpu-offset property in gic device tree node
  ARM: EXYNOS: Bring exynos4-dt up to date
  Linux 3.3-rc3

This includes an update to the v3.3-rc3 release from v3.3-rc2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

378 files changed, 2974 insertions, 5492 deletions

diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index 2f7fd4360848..9c27e5125dd2 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -102,9 +102,12 @@ X!Iinclude/linux/kobject.h
 !Iinclude/linux/device.h
      </sect1>
      <sect1><title>Device Drivers Base</title>
+!Idrivers/base/init.c
 !Edrivers/base/driver.c
 !Edrivers/base/core.c
+!Edrivers/base/syscore.c
 !Edrivers/base/class.c
+!Idrivers/base/node.c
 !Edrivers/base/firmware_class.c
 !Edrivers/base/transport_class.c
 <!-- Cannot be included, because
@@ -113,7 +116,7 @@ X!Iinclude/linux/kobject.h
      exceed allowed 44 characters maximum
 X!Edrivers/base/attribute_container.c
 -->
-!Edrivers/base/sys.c
+!Edrivers/base/dd.c
 <!--
 X!Edrivers/base/interface.c
 -->
@@ -121,6 +124,11 @@ X!Edrivers/base/interface.c
 !Edrivers/base/platform.c
 !Edrivers/base/bus.c
      </sect1>
+     <sect1><title>Device Drivers DMA Management</title>
+!Edrivers/base/dma-buf.c
+!Edrivers/base/dma-coherent.c
+!Edrivers/base/dma-mapping.c
+     </sect1>
      <sect1><title>Device Drivers Power Management</title>
 !Edrivers/base/power/main.c
      </sect1>
@@ -219,7 +227,7 @@ X!Isound/sound_firmware.c
   <chapter id="uart16x50">
      <title>16x50 UART Driver</title>
 !Edrivers/tty/serial/serial_core.c
-!Edrivers/tty/serial/8250.c
+!Edrivers/tty/serial/8250/8250.c
   </chapter>
 
   <chapter id="fbdev">
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index 10c64c8a13d4..41c0c5d1ba14 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -233,6 +233,10 @@ certainly invest a bit more effort into libata core layer).
   6. List of managed interfaces
   -----------------------------
 
+MEM
+  devm_kzalloc()
+  devm_kfree()
+
 IO region
   devm_request_region()
   devm_request_mem_region()
diff --git a/Documentation/input/event-codes.txt b/Documentation/input/event-codes.txt
index 23fcb05175be..53305bd08182 100644
--- a/Documentation/input/event-codes.txt
+++ b/Documentation/input/event-codes.txt
@@ -17,11 +17,11 @@ reports supported by a device are also provided by sysfs in
 class/input/event*/device/capabilities/, and the properties of a device are
 provided in class/input/event*/device/properties.
 
-Types:
-==========
-Types are groupings of codes under a logical input construct. Each type has a
-set of applicable codes to be used in generating events. See the Codes section
-for details on valid codes for each type.
+Event types:
+===========
+Event types are groupings of codes under a logical input construct. Each
+type has a set of applicable codes to be used in generating events. See the
+Codes section for details on valid codes for each type.
 
 * EV_SYN:
   - Used as markers to separate events. Events may be separated in time or in
@@ -63,9 +63,9 @@ for details on valid codes for each type.
 * EV_FF_STATUS:
   - Used to receive force feedback device status.
 
-Codes:
-==========
-Codes define the precise type of event.
+Event codes:
+===========
+Event codes define the precise type of event.
 
 EV_SYN:
 ----------
@@ -220,6 +220,56 @@ EV_PWR:
 EV_PWR events are a special type of event used specifically for power
 mangement. Its usage is not well defined. To be addressed later.
 
+Device properties:
+=================
+Normally, userspace sets up an input device based on the data it emits,
+i.e., the event types. In the case of two devices emitting the same event
+types, additional information can be provided in the form of device
+properties.
+
+INPUT_PROP_DIRECT + INPUT_PROP_POINTER:
+--------------------------------------
+The INPUT_PROP_DIRECT property indicates that device coordinates should be
+directly mapped to screen coordinates (not taking into account trivial
+transformations, such as scaling, flipping and rotating). Non-direct input
+devices require non-trivial transformation, such as absolute to relative
+transformation for touchpads. Typical direct input devices: touchscreens,
+drawing tablets; non-direct devices: touchpads, mice.
+
+The INPUT_PROP_POINTER property indicates that the device is not transposed
+on the screen and thus requires use of an on-screen pointer to trace user's
+movements.  Typical pointer devices: touchpads, tablets, mice; non-pointer
+device: touchscreen.
+
+If neither INPUT_PROP_DIRECT or INPUT_PROP_POINTER are set, the property is
+considered undefined and the device type should be deduced in the
+traditional way, using emitted event types.
+
+INPUT_PROP_BUTTONPAD:
+--------------------
+For touchpads where the button is placed beneath the surface, such that
+pressing down on the pad causes a button click, this property should be
+set. Common in clickpad notebooks and macbooks from 2009 and onwards.
+
+Originally, the buttonpad property was coded into the bcm5974 driver
+version field under the name integrated button. For backwards
+compatibility, both methods need to be checked in userspace.
+
+INPUT_PROP_SEMI_MT:
+------------------
+Some touchpads, most common between 2008 and 2011, can detect the presence
+of multiple contacts without resolving the individual positions; only the
+number of contacts and a rectangular shape is known. For such
+touchpads, the semi-mt property should be set.
+
+Depending on the device, the rectangle may enclose all touches, like a
+bounding box, or just some of them, for instance the two most recent
+touches. The diversity makes the rectangle of limited use, but some
+gestures can normally be extracted from it.
+
+If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT
+device.
+
 Guidelines:
 ==========
 The guidelines below ensure proper single-touch and multi-finger functionality.
@@ -240,6 +290,8 @@ used to report when a touch is active on the screen.
 BTN_{MOUSE,LEFT,MIDDLE,RIGHT} must not be reported as the result of touch
 contact. BTN_TOOL_<name> events should be reported where possible.
 
+For new hardware, INPUT_PROP_DIRECT should be set.
+
 Trackpads:
 ----------
 Legacy trackpads that only provide relative position information must report
@@ -250,6 +302,8 @@ location of the touch. BTN_TOUCH should be used to report when a touch is active
 on the trackpad. Where multi-finger support is available, BTN_TOOL_<name> should
 be used to report the number of touches active on the trackpad.
 
+For new hardware, INPUT_PROP_POINTER should be set.
+
 Tablets:
 ----------
 BTN_TOOL_<name> events must be reported when a stylus or other tool is active on
@@ -260,3 +314,5 @@ button may be used for buttons on the tablet except BTN_{MOUSE,LEFT}.
 BTN_{0,1,2,etc} are good generic codes for unlabeled buttons. Do not use
 meaningful buttons, like BTN_FORWARD, unless the button is labeled for that
 purpose on the device.
+
+For new hardware, both INPUT_PROP_DIRECT and INPUT_PROP_POINTER should be set.
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index 6727b92bc2fb..150fd3833d0b 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -857,42 +857,41 @@ case), we define a mapping like this:
 
 ...
 {
-        .name "2bit"
+        .name = "2bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "4bit"
+        .name = "4bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "4bit"
+        .name = "4bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_2_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
-        .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_2_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_3_grp",
@@ -995,7 +994,7 @@ This is enabled by simply setting the .hog_on_boot field in the map to true,
 like this:
 
 {
-        .name "POWERMAP"
+        .name = "POWERMAP"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "power_func",
         .hog_on_boot = true,
@@ -1025,7 +1024,7 @@ it, disables and releases it, and muxes it in on the pins defined by group B:
 
 foo_switch()
 {
-        struct pinmux pmx;
+        struct pinmux *pmx;
 
         /* Enable on position A */
         pmx = pinmux_get(&device, "spi0-pos-A");
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
index 21fd05c28e73..f0ab5cf28fca 100644
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
@@ -25,7 +25,8 @@ Procedure for submitting patches to the -stable tree:
 
  - Send the patch, after verifying that it follows the above rules, to
    stable@vger.kernel.org.  You must note the upstream commit ID in the
-   changelog of your submission.
+   changelog of your submission, as well as the kernel version you wish
+   it to be applied to.
  - To have the patch automatically included in the stable tree, add the tag
      Cc: stable@vger.kernel.org
    in the sign-off area. Once the patch is merged it will be applied to
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 8c20fbd8b42d..6d78841fd416 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -601,6 +601,8 @@ can be ORed together:
         instead of using the one provided by the hardware.
  512 - A kernel warning has occurred.
 1024 - A module from drivers/staging was loaded.
+2048 - The system is working around a severe firmware bug.
+4096 - An out-of-tree module has been loaded.
 
 ==============================================================
 
diff --git a/Documentation/virtual/00-INDEX b/Documentation/virtual/00-INDEX
index 8e601991d91c..924bd462675e 100644
--- a/Documentation/virtual/00-INDEX
+++ b/Documentation/virtual/00-INDEX
@@ -4,8 +4,6 @@ Virtualization support in the Linux kernel.
         - this file.
 kvm/
         - Kernel Virtual Machine.  See also http://linux-kvm.org
-lguest/
-        - Extremely simple hypervisor for experimental/educational use.
 uml/
         - User Mode Linux, builds/runs Linux kernel as a userspace program.
 virtio.txt
diff --git a/MAINTAINERS b/MAINTAINERS
index 1b6e83550c76..55ca0bea142c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -159,7 +159,7 @@ S:	Maintained
 F:      drivers/net/ethernet/realtek/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-serial@vger.kernel.org
 W:      http://serial.sourceforge.net
 S:      Maintained
@@ -789,12 +789,6 @@ F:	arch/arm/mach-mx*/
 F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
 
-ARM/FREESCALE IMX51
-M:      Amit Kucheria <amit.kucheria@canonical.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-mx5/
-
 ARM/FREESCALE IMX6
 M:      Shawn Guo <shawn.guo@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1783,9 +1777,9 @@ X:	net/wireless/wext*
 
 CHAR and MISC DRIVERS
 M:      Arnd Bergmann <arnd@arndb.de>
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
-S:      Maintained
+S:      Supported
 F:      drivers/char/*
 F:      drivers/misc/*
 
@@ -2287,7 +2281,7 @@ F:	drivers/acpi/dock.c
 DOCUMENTATION
 M:      Randy Dunlap <rdunlap@xenotime.net>
 L:      linux-doc@vger.kernel.org
-T:      quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
+T:      quilt http://xenotime.net/kernel-doc-patches/current/
 S:      Maintained
 F:      Documentation/
 
@@ -2320,7 +2314,7 @@ F:	lib/lru_cache.c
 F:      Documentation/blockdev/drbd/
 
 DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
 S:      Supported
 F:      Documentation/kobject.txt
@@ -3992,11 +3986,11 @@ M:	Rusty Russell <rusty@rustcorp.com.au>
 L:      lguest@lists.ozlabs.org
 W:      http://lguest.ozlabs.org/
 S:      Odd Fixes
-F:      Documentation/virtual/lguest/
+F:      arch/x86/include/asm/lguest*.h
 F:      arch/x86/lguest/
 F:      drivers/lguest/
 F:      include/linux/lguest*.h
-F:      arch/x86/include/asm/lguest*.h
+F:      tools/lguest/
 
 LINUX FOR IBM pSERIES (RS/6000)
 M:      Paul Mackerras <paulus@au.ibm.com>
@@ -4136,10 +4130,11 @@ L:	linux-ntfs-dev@lists.sourceforge.net
 W:      http://www.linux-ntfs.org/content/view/19/37/
 S:      Maintained
 F:      Documentation/ldm.txt
-F:      fs/partitions/ldm.*
+F:      block/partitions/ldm.*
 
 LogFS
 M:      Joern Engel <joern@logfs.org>
+M:      Prasad Joshi <prasadjoshi.linux@gmail.com>
 L:      logfs@logfs.org
 W:      logfs.org
 S:      Maintained
@@ -4281,13 +4276,6 @@ S:	Orphan
 F:      drivers/video/matrox/matroxfb_*
 F:      include/linux/matroxfb.h
 
-MAX1668 TEMPERATURE SENSOR DRIVER
-M:      "David George" <david.george@ska.ac.za>
-L:      lm-sensors@lm-sensors.org
-S:      Maintained
-F:      Documentation/hwmon/max1668
-F:      drivers/hwmon/max1668.c
-
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
 L:      lm-sensors@lm-sensors.org
@@ -5639,7 +5627,7 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
 F:      drivers/s390/
-F:      fs/partitions/ibm.c
+F:      block/partitions/ibm.c
 F:      Documentation/s390/
 F:      Documentation/DocBook/s390*
 
@@ -6282,15 +6270,15 @@ S:	Maintained
 F:      arch/alpha/kernel/srm_env.c
 
 STABLE BRANCH
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      stable@vger.kernel.org
-S:      Maintained
+S:      Supported
 
 STAGING SUBSYSTEM
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 L:      devel@driverdev.osuosl.org
-S:      Maintained
+S:      Supported
 F:      drivers/staging/
 
 STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
@@ -6402,11 +6390,6 @@ M:	Omar Ramirez Luna <omar.ramirez@ti.com>
 S:      Odd Fixes
 F:      drivers/staging/tidspbridge/
 
-STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
-L:      linux-media@vger.kernel.org
-S:      Odd Fixes
-F:      drivers/staging/tm6000/
-
 STAGING - USB ENE SM/MS CARD READER DRIVER
 M:      Al Cho <acho@novell.com>
 S:      Odd Fixes
@@ -6675,10 +6658,10 @@ S:	Maintained
 K:      ^Subject:.*(?i)trivial
 
 TTY LAYER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
-S:      Maintained
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
-F:      drivers/tty/*
+F:      drivers/tty/
 F:      drivers/tty/serial/serial_core.c
 F:      include/linux/serial_core.h
 F:      include/linux/serial.h
@@ -6964,7 +6947,7 @@ S:	Maintained
 F:      drivers/usb/serial/digi_acceleport.c
 
 USB SERIAL DRIVER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
 S:      Supported
 F:      Documentation/usb/usb-serial.txt
@@ -6979,9 +6962,8 @@ S:	Maintained
 F:      drivers/usb/serial/empeg.c
 
 USB SERIAL KEYSPAN DRIVER
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
-W:      http://www.kroah.com/linux/
 S:      Maintained
 F:      drivers/usb/serial/*keyspan*
 
@@ -7009,7 +6991,7 @@ F:	Documentation/video4linux/sn9c102.txt
 F:      drivers/media/video/sn9c102/
 
 USB SUBSYSTEM
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
 W:      http://www.linux-usb.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
@@ -7096,7 +7078,7 @@ F:	fs/hppfs/
 
 USERSPACE I/O (UIO)
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:      Maintained
 F:      Documentation/DocBook/uio-howto.tmpl
 F:      drivers/uio/
@@ -7371,6 +7353,7 @@ S:	Supported
 F:      Documentation/hwmon/wm83??
 F:      arch/arm/mach-s3c64xx/mach-crag6410*
 F:      drivers/leds/leds-wm83*.c
+F:      drivers/hwmon/wm83??-hwmon.c
 F:      drivers/input/misc/wm831x-on.c
 F:      drivers/input/touchscreen/wm831x-ts.c
 F:      drivers/input/touchscreen/wm97*.c
diff --git a/Makefile b/Makefile
index 71e6ed21dd15..7c44b676b77a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 3
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc3
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 63d7578856c1..a1dd2ee83753 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -29,6 +29,7 @@
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
                 interrupt-controller;
+                cpu-offset = <0x8000>;
                 reg = <0x10490000 0x1000>, <0x10480000 0x100>;
         };
 
diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h
index 5d3ed7e38561..314d4664eae7 100644
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
@@ -198,7 +198,15 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,
         unsigned long addr)
 {
         pgtable_page_dtor(pte);
-        tlb_add_flush(tlb, addr);
+
+        /*
+         * With the classic ARM MMU, a pte page has two corresponding pmd
+         * entries, each covering 1MB.
+         */
+        addr &= PMD_MASK;
+        tlb_add_flush(tlb, addr + SZ_1M - PAGE_SIZE);
+        tlb_add_flush(tlb, addr + SZ_1M);
+
         tlb_remove_page(tlb, pte);
 }
 
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 3a456c6c7005..be16a48007b4 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -790,7 +790,7 @@ __kuser_cmpxchg64:				@ 0xffff0f60
         smp_dmb arm
         rsbs    r0, r3, #0                      @ set returned val and C flag
         ldmfd   sp!, {r4, r5, r6, r7}
-        bx      lr
+        usr_ret lr
 
 #elif !defined(CONFIG_SMP)
 
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
index 460bbbb6b885..6933244c68f9 100644
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
@@ -469,6 +469,20 @@ static const unsigned armv7_a5_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                         [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
                 },
         },
+        [C(NODE)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
 };
 
 /*
@@ -579,6 +593,20 @@ static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                         [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
                 },
         },
+        [C(NODE)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
 };
 
 /*
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index e1d5e1929fbd..e33870ff0ac0 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -699,10 +699,13 @@ static int vfp_set(struct task_struct *target,
 {
         int ret;
         struct thread_info *thread = task_thread_info(target);
-        struct vfp_hard_struct new_vfp = thread->vfpstate.hard;
+        struct vfp_hard_struct new_vfp;
         const size_t user_fpregs_offset = offsetof(struct user_vfp, fpregs);
         const size_t user_fpscr_offset = offsetof(struct user_vfp, fpscr);
 
+        vfp_sync_hwstate(thread);
+        new_vfp = thread->vfpstate.hard;
+
         ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
                                   &new_vfp.fpregs,
                                   user_fpregs_offset,
@@ -723,9 +726,8 @@ static int vfp_set(struct task_struct *target,
         if (ret)
                 return ret;
 
-        vfp_sync_hwstate(thread);
-        thread->vfpstate.hard = new_vfp;
         vfp_flush_hwstate(thread);
+        thread->vfpstate.hard = new_vfp;
 
         return 0;
 }
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 0340224cf73c..9e617bd4a146 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -227,6 +227,8 @@ static int restore_vfp_context(struct vfp_sigframe __user *frame)
         if (magic != VFP_MAGIC || size != VFP_STORAGE_SIZE)
                 return -EINVAL;
 
+        vfp_flush_hwstate(thread);
+
         /*
          * Copy the floating point registers. There can be unused
          * registers see asm/hwcap.h for details.
@@ -251,9 +253,6 @@ static int restore_vfp_context(struct vfp_sigframe __user *frame)
         __get_user_error(h->fpinst, &frame->ufp_exc.fpinst, err);
         __get_user_error(h->fpinst2, &frame->ufp_exc.fpinst2, err);
 
-        if (!err)
-                vfp_flush_hwstate(thread);
-
         return err ? -EFAULT : 0;
 }
 
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 85fa02767d67..e6b02fdf1b09 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -15,11 +15,13 @@
 #include <linux/serial_core.h>
 
 #include <asm/mach/arch.h>
+#include <asm/hardware/gic.h>
 #include <mach/map.h>
 
 #include <plat/cpu.h>
 #include <plat/regs-serial.h>
-#include <plat/exynos4.h>
+
+#include "common.h"
 
 /*
  * The following lookup table is used to override device names when devices
@@ -60,7 +62,7 @@ static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = {
 
 static void __init exynos4210_dt_map_io(void)
 {
-        s5p_init_io(NULL, 0, S5P_VA_CHIPID);
+        exynos_init_io(NULL, 0);
         s3c24xx_init_clocks(24000000);
 }
 
@@ -79,7 +81,9 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
         /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */
         .init_irq       = exynos4_init_irq,
         .map_io         = exynos4210_dt_map_io,
+        .handle_irq     = gic_handle_irq,
         .init_machine   = exynos4210_dt_machine_init,
         .timer          = &exynos4_timer,
         .dt_compat      = exynos4210_dt_compat,
+        .restart        = exynos4_restart,
 MACHINE_END
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 39fba9df17fb..21fc87648660 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -52,8 +52,9 @@
 #define ETH_KS8851_QUART                138
 #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO        184
 #define OMAP4_SFH7741_ENABLE_GPIO               188
-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
+#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
+#define HDMI_GPIO_HPD  63 /* Hotplug detect */
 #define DISPLAY_SEL_GPIO        59      /* LCD2/PicoDLP switch */
 #define DLP_POWER_ON_GPIO       40
 
@@ -603,8 +604,9 @@ static void __init omap_sfh7741prox_init(void)
 }
 
 static struct gpio sdp4430_hdmi_gpios[] = {
-        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_hpd"   },
+        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
         { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_ls_oe" },
+        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
 };
 
 static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -621,8 +623,7 @@ static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
 
 static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
 {
-        gpio_free(HDMI_GPIO_LS_OE);
-        gpio_free(HDMI_GPIO_HPD);
+        gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));
 }
 
 static struct nokia_dsi_panel_data dsi1_panel = {
@@ -738,6 +739,10 @@ static void sdp4430_lcd_init(void)
                 pr_err("%s: Could not get lcd2_reset_gpio\n", __func__);
 }
 
+static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
+        .hpd_gpio = HDMI_GPIO_HPD,
+};
+
 static struct omap_dss_device sdp4430_hdmi_device = {
         .name = "hdmi",
         .driver_name = "hdmi_panel",
@@ -745,6 +750,7 @@ static struct omap_dss_device sdp4430_hdmi_device = {
         .platform_enable = sdp4430_panel_enable_hdmi,
         .platform_disable = sdp4430_panel_disable_hdmi,
         .channel = OMAP_DSS_CHANNEL_DIGIT,
+        .data = &sdp4430_hdmi_data,
 };
 
 static struct picodlp_panel_data sdp4430_picodlp_pdata = {
@@ -829,6 +835,10 @@ static void omap_4430sdp_display_init(void)
                 omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
         else
                 omap_hdmi_init(0);
+
+        omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
 }
 
 #ifdef CONFIG_OMAP_MUX
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 30ad40db2cf3..b7779c206a90 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -51,8 +51,9 @@
 #define GPIO_HUB_NRESET         62
 #define GPIO_WIFI_PMENA         43
 #define GPIO_WIFI_IRQ           53
-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
+#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
+#define HDMI_GPIO_HPD  63 /* Hotplug detect */
 
 /* wl127x BT, FM, GPS connectivity chip */
 static int wl1271_gpios[] = {46, -1, -1};
@@ -413,8 +414,9 @@ int __init omap4_panda_dvi_init(void)
 }
 
 static struct gpio panda_hdmi_gpios[] = {
-        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd"   },
+        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
         { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
+        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
 };
 
 static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -431,10 +433,13 @@ static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
 
 static void omap4_panda_panel_disable_hdmi(struct omap_dss_device *dssdev)
 {
-        gpio_free(HDMI_GPIO_LS_OE);
-        gpio_free(HDMI_GPIO_HPD);
+        gpio_free_array(panda_hdmi_gpios, ARRAY_SIZE(panda_hdmi_gpios));
 }
 
+static struct omap_dss_hdmi_data omap4_panda_hdmi_data = {
+        .hpd_gpio = HDMI_GPIO_HPD,
+};
+
 static struct omap_dss_device  omap4_panda_hdmi_device = {
         .name = "hdmi",
         .driver_name = "hdmi_panel",
@@ -442,6 +447,7 @@ static struct omap_dss_device  omap4_panda_hdmi_device = {
         .platform_enable = omap4_panda_panel_enable_hdmi,
         .platform_disable = omap4_panda_panel_disable_hdmi,
         .channel = OMAP_DSS_CHANNEL_DIGIT,
+        .data = &omap4_panda_hdmi_data,
 };
 
 static struct omap_dss_device *omap4_panda_dss_devices[] = {
@@ -473,6 +479,10 @@ void omap4_panda_display_init(void)
                 omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
         else
                 omap_hdmi_init(0);
+
+        omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
 }
 
 static void __init omap4_panda_init(void)
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 3c446d1a1781..3677b1f58b85 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -103,12 +103,8 @@ static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)
         u32 reg;
         u16 control_i2c_1;
 
-        /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-        omap_mux_init_signal("hdmi_hpd",
-                        OMAP_PIN_INPUT_PULLUP);
         omap_mux_init_signal("hdmi_cec",
                         OMAP_PIN_INPUT_PULLUP);
-        /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
         omap_mux_init_signal("hdmi_ddc_scl",
                         OMAP_PIN_INPUT_PULLUP);
         omap_mux_init_signal("hdmi_ddc_sda",
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 6fcf304d3cdf..a83cf51fc099 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -662,6 +662,7 @@ static struct sh_dmae_pdata usb_dma0_platform_data = {
         .dmaor_is_32bit = 1,
         .needs_tend_set = 1,
         .no_dmars       = 1,
+        .slave_only     = 1,
 };
 
 static struct resource sh7372_usb_dmae0_resources[] = {
@@ -723,6 +724,7 @@ static struct sh_dmae_pdata usb_dma1_platform_data = {
         .dmaor_is_32bit = 1,
         .needs_tend_set = 1,
         .no_dmars       = 1,
+        .slave_only     = 1,
 };
 
 static struct resource sh7372_usb_dmae1_resources[] = {
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index ba159370fa5f..80632e8d7538 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -225,8 +225,7 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
                 if ((area->flags & VM_ARM_MTYPE_MASK) != VM_ARM_MTYPE(mtype))
                         continue;
                 if (__phys_to_pfn(area->phys_addr) > pfn ||
-                    __pfn_to_phys(pfn) + offset + size-1 >
-                    area->phys_addr + area->size-1)
+                    __pfn_to_phys(pfn) + size-1 > area->phys_addr + area->size-1)
                         continue;
                 /* we can drop the lock here as we know *area is static */
                 read_unlock(&vmlist_lock);
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 197e96f70405..3dea7231f637 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -8,6 +8,7 @@ config AVR32
         select HAVE_KPROBES
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
+        select GENERIC_ATOMIC64
         select HARDIRQS_SW_RESEND
         select GENERIC_IRQ_SHOW
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 74f23a460ba2..c8d6efb99dbf 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -19,6 +19,7 @@ config MICROBLAZE
         select GENERIC_IRQ_SHOW
         select GENERIC_PCI_IOMAP
         select GENERIC_CPU_DEVICES
+        select GENERIC_ATOMIC64
 
 config SWAP
         def_bool n
diff --git a/arch/microblaze/include/asm/atomic.h b/arch/microblaze/include/asm/atomic.h
index 6d2e1d418be7..615f53992c65 100644
--- a/arch/microblaze/include/asm/atomic.h
+++ b/arch/microblaze/include/asm/atomic.h
@@ -2,6 +2,7 @@
 #define _ASM_MICROBLAZE_ATOMIC_H
 
 #include <asm-generic/atomic.h>
+#include <asm-generic/atomic64.h>
 
 /*
  * Atomically test *v and decrement if it is greater than 0.
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index d4fc1a971779..604cd9dd1333 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -26,7 +26,6 @@
 #include <linux/cache.h>
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
-#include <linux/cpu.h>
 #include <asm/cacheflush.h>
 #include <asm/entry.h>
 #include <asm/cpuinfo.h>
@@ -227,23 +226,5 @@ static int __init setup_bus_notifier(void)
 
         return 0;
 }
-arch_initcall(setup_bus_notifier);
-
-static DEFINE_PER_CPU(struct cpu, cpu_devices);
-
-static int __init topology_init(void)
-{
-        int i, ret;
-
-        for_each_present_cpu(i) {
-                struct cpu *c = &per_cpu(cpu_devices, i);
 
-                ret = register_cpu(c, i);
-                if (ret)
-                        printk(KERN_WARNING "topology_init: register_cpu %d "
-                                                "failed (%d)\n", i, ret);
-        }
-
-        return 0;
-}
-subsys_initcall(topology_init);
+arch_initcall(setup_bus_notifier);
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c4c1312473fb..5ab6e89603c5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2356,6 +2356,7 @@ config PCI
         depends on HW_HAS_PCI
         select PCI_DOMAINS
         select GENERIC_PCI_IOMAP
+        select NO_GENERIC_PCI_IOPORT_MAP
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c
index 2635b1a96333..fd35daa45314 100644
--- a/arch/mips/lib/iomap-pci.c
+++ b/arch/mips/lib/iomap-pci.c
@@ -10,8 +10,8 @@
 #include <linux/module.h>
 #include <asm/io.h>
 
-static void __iomem *ioport_map_pci(struct pci_dev *dev,
-                                     unsigned long port, unsigned int nr)
+void __iomem *__pci_ioport_map(struct pci_dev *dev,
+                               unsigned long port, unsigned int nr)
 {
         struct pci_controller *ctrl = dev->bus->sysdata;
         unsigned long base = ctrl->io_map_base;
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index e9f353341693..0ad2f1e1ce9e 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -88,7 +88,6 @@ KBUILD_CFLAGS	+= -pipe -fno-strength-reduce -Wno-sign-compare
 KBUILD_AFLAGS   += $(aflags-y)
 
 OBJCOPYFLAGS    := -O binary
-LDFLAGS_vmlinux := -e start
 
 head-y          := arch/s390/kernel/head.o
 head-y          += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index e4c79ebb40e6..21109c63eb12 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -9,12 +9,12 @@
 #ifndef CONFIG_64BIT
 OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390")
 OUTPUT_ARCH(s390)
-ENTRY(_start)
+ENTRY(startup)
 jiffies = jiffies_64 + 4;
 #else
 OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
 OUTPUT_ARCH(s390:64-bit)
-ENTRY(_start)
+ENTRY(startup)
 jiffies = jiffies_64;
 #endif
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3c8db65c89e5..713fb58ca507 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -859,6 +859,7 @@ config PCI
         depends on SYS_SUPPORTS_PCI
         select PCI_DOMAINS
         select GENERIC_PCI_IOMAP
+        select NO_GENERIC_PCI_IOPORT_MAP
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 8f18dd090a66..1e7b0e2e764d 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -356,8 +356,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
 #ifndef CONFIG_GENERIC_IOMAP
 
-static void __iomem *ioport_map_pci(struct pci_dev *dev,
-                                    unsigned long port, unsigned int nr)
+void __iomem *__pci_ioport_map(struct pci_dev *dev,
+                               unsigned long port, unsigned int nr)
 {
         struct pci_channel *chan = dev->sysdata;
 
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 96657992a72e..ca5580e4d813 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -33,6 +33,7 @@ config SPARC
 config SPARC32
         def_bool !64BIT
         select GENERIC_ATOMIC64
+        select CLZ_TAB
 
 config SPARC64
         def_bool 64BIT
diff --git a/arch/sparc/lib/divdi3.S b/arch/sparc/lib/divdi3.S
index 681b3683da9e..d74bc0925f2d 100644
--- a/arch/sparc/lib/divdi3.S
+++ b/arch/sparc/lib/divdi3.S
@@ -17,23 +17,9 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-        .data
-        .align 8
-        .globl  __clz_tab
-__clz_tab:
-        .byte   0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-        .byte   6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6
-        .byte   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
-        .byte   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
-        .byte   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-        .byte   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-        .byte   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-        .byte   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-        .size    __clz_tab,256
-        .global .udiv
-
         .text
         .align 4
+        .global .udiv
         .globl __divdi3
 __divdi3:
         save %sp,-104,%sp
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
index 0c9fa2745f13..b3b733262909 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
@@ -145,13 +145,13 @@ extern void __add_wrong_size(void)
 
 #ifdef __HAVE_ARCH_CMPXCHG
 #define cmpxchg(ptr, old, new)                                          \
-        __cmpxchg((ptr), (old), (new), sizeof(*ptr))
+        __cmpxchg(ptr, old, new, sizeof(*(ptr)))
 
 #define sync_cmpxchg(ptr, old, new)                                     \
-        __sync_cmpxchg((ptr), (old), (new), sizeof(*ptr))
+        __sync_cmpxchg(ptr, old, new, sizeof(*(ptr)))
 
 #define cmpxchg_local(ptr, old, new)                                    \
-        __cmpxchg_local((ptr), (old), (new), sizeof(*ptr))
+        __cmpxchg_local(ptr, old, new, sizeof(*(ptr)))
 #endif
 
 /*
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index ab4092e3214e..7b9cfc4878af 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -190,6 +190,9 @@ struct x86_emulate_ops {
         int (*intercept)(struct x86_emulate_ctxt *ctxt,
                          struct x86_instruction_info *info,
                          enum x86_intercept_stage stage);
+
+        bool (*get_cpuid)(struct x86_emulate_ctxt *ctxt,
+                         u32 *eax, u32 *ebx, u32 *ecx, u32 *edx);
 };
 
 typedef u32 __attribute__((vector_size(16))) sse128_t;
@@ -298,6 +301,19 @@ struct x86_emulate_ctxt {
 #define X86EMUL_MODE_PROT     (X86EMUL_MODE_PROT16|X86EMUL_MODE_PROT32| \
                                X86EMUL_MODE_PROT64)
 
+/* CPUID vendors */
+#define X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx 0x68747541
+#define X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx 0x444d4163
+#define X86EMUL_CPUID_VENDOR_AuthenticAMD_edx 0x69746e65
+
+#define X86EMUL_CPUID_VENDOR_AMDisbetterI_ebx 0x69444d41
+#define X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx 0x21726574
+#define X86EMUL_CPUID_VENDOR_AMDisbetterI_edx 0x74656273
+
+#define X86EMUL_CPUID_VENDOR_GenuineIntel_ebx 0x756e6547
+#define X86EMUL_CPUID_VENDOR_GenuineIntel_ecx 0x6c65746e
+#define X86EMUL_CPUID_VENDOR_GenuineIntel_edx 0x49656e69
+
 enum x86_intercept_stage {
         X86_ICTP_NONE = 0,   /* Allow zero-init to not match anything */
         X86_ICPT_PRE_EXCEPT,
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 1aae78f775fc..4025fe4f928f 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -252,7 +252,8 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
         unsigned short ss;
         unsigned long sp;
 #endif
-        printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
+        printk(KERN_DEFAULT
+               "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
         printk("PREEMPT ");
 #endif
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 6d728d9284bd..17107bd6e1f0 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -129,7 +129,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
         if (!stack) {
                 if (regs)
                         stack = (unsigned long *)regs->sp;
-                else if (task && task != current)
+                else if (task != current)
                         stack = (unsigned long *)task->thread.sp;
                 else
                         stack = &dummy;
@@ -269,11 +269,11 @@ void show_registers(struct pt_regs *regs)
                 unsigned char c;
                 u8 *ip;
 
-                printk(KERN_EMERG "Stack:\n");
+                printk(KERN_DEFAULT "Stack:\n");
                 show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
-                                   0, KERN_EMERG);
+                                   0, KERN_DEFAULT);
 
-                printk(KERN_EMERG "Code: ");
+                printk(KERN_DEFAULT "Code: ");
 
                 ip = (u8 *)regs->ip - code_prologue;
                 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 37a458b521a6..d840e69a853c 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -39,6 +39,14 @@ static int reboot_mode;
 enum reboot_type reboot_type = BOOT_ACPI;
 int reboot_force;
 
+/* This variable is used privately to keep track of whether or not
+ * reboot_type is still set to its default value (i.e., reboot= hasn't
+ * been set on the command line).  This is needed so that we can
+ * suppress DMI scanning for reboot quirks.  Without it, it's
+ * impossible to override a faulty reboot quirk without recompiling.
+ */
+static int reboot_default = 1;
+
 #if defined(CONFIG_X86_32) && defined(CONFIG_SMP)
 static int reboot_cpu = -1;
 #endif
@@ -67,6 +75,12 @@ bool port_cf9_safe = false;
 static int __init reboot_setup(char *str)
 {
         for (;;) {
+                /* Having anything passed on the command line via
+                 * reboot= will cause us to disable DMI checking
+                 * below.
+                 */
+                reboot_default = 0;
+
                 switch (*str) {
                 case 'w':
                         reboot_mode = 0x1234;
@@ -295,14 +309,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
                         DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
                 },
         },
-        {       /* Handle problems with rebooting on VersaLogic Menlow boards */
-                .callback = set_bios_reboot,
-                .ident = "VersaLogic Menlow based board",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "VersaLogic Corporation"),
-                        DMI_MATCH(DMI_BOARD_NAME, "VersaLogic Menlow board"),
-                },
-        },
         { /* Handle reboot issue on Acer Aspire one */
                 .callback = set_kbd_reboot,
                 .ident = "Acer Aspire One A110",
@@ -316,7 +322,12 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 
 static int __init reboot_init(void)
 {
-        dmi_check_system(reboot_dmi_table);
+        /* Only do the DMI check if reboot_type hasn't been overridden
+         * on the command line
+         */
+        if (reboot_default) {
+                dmi_check_system(reboot_dmi_table);
+        }
         return 0;
 }
 core_initcall(reboot_init);
@@ -465,7 +476,12 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
 
 static int __init pci_reboot_init(void)
 {
-        dmi_check_system(pci_reboot_dmi_table);
+        /* Only do the DMI check if reboot_type hasn't been overridden
+         * on the command line
+         */
+        if (reboot_default) {
+                dmi_check_system(pci_reboot_dmi_table);
+        }
         return 0;
 }
 core_initcall(pci_reboot_init);
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 05a562b85025..0982507b962a 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1891,6 +1891,51 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
         ss->p = 1;
 }
 
+static bool em_syscall_is_enabled(struct x86_emulate_ctxt *ctxt)
+{
+        struct x86_emulate_ops *ops = ctxt->ops;
+        u32 eax, ebx, ecx, edx;
+
+        /*
+         * syscall should always be enabled in longmode - so only become
+         * vendor specific (cpuid) if other modes are active...
+         */
+        if (ctxt->mode == X86EMUL_MODE_PROT64)
+                return true;
+
+        eax = 0x00000000;
+        ecx = 0x00000000;
+        if (ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx)) {
+                /*
+                 * Intel ("GenuineIntel")
+                 * remark: Intel CPUs only support "syscall" in 64bit
+                 * longmode. Also an 64bit guest with a
+                 * 32bit compat-app running will #UD !! While this
+                 * behaviour can be fixed (by emulating) into AMD
+                 * response - CPUs of AMD can't behave like Intel.
+                 */
+                if (ebx == X86EMUL_CPUID_VENDOR_GenuineIntel_ebx &&
+                    ecx == X86EMUL_CPUID_VENDOR_GenuineIntel_ecx &&
+                    edx == X86EMUL_CPUID_VENDOR_GenuineIntel_edx)
+                        return false;
+
+                /* AMD ("AuthenticAMD") */
+                if (ebx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx &&
+                    ecx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx &&
+                    edx == X86EMUL_CPUID_VENDOR_AuthenticAMD_edx)
+                        return true;
+
+                /* AMD ("AMDisbetter!") */
+                if (ebx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ebx &&
+                    ecx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx &&
+                    edx == X86EMUL_CPUID_VENDOR_AMDisbetterI_edx)
+                        return true;
+        }
+
+        /* default: (not Intel, not AMD), apply Intel's stricter rules... */
+        return false;
+}
+
 static int em_syscall(struct x86_emulate_ctxt *ctxt)
 {
         struct x86_emulate_ops *ops = ctxt->ops;
@@ -1904,9 +1949,15 @@ static int em_syscall(struct x86_emulate_ctxt *ctxt)
             ctxt->mode == X86EMUL_MODE_VM86)
                 return emulate_ud(ctxt);
 
+        if (!(em_syscall_is_enabled(ctxt)))
+                return emulate_ud(ctxt);
+
         ops->get_msr(ctxt, MSR_EFER, &efer);
         setup_syscalls_segments(ctxt, &cs, &ss);
 
+        if (!(efer & EFER_SCE))
+                return emulate_ud(ctxt);
+
         ops->get_msr(ctxt, MSR_STAR, &msr_data);
         msr_data >>= 32;
         cs_sel = (u16)(msr_data & 0xfffc);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 14d6cadc4ba6..9cbfc0698118 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1495,6 +1495,8 @@ static void record_steal_time(struct kvm_vcpu *vcpu)
 
 int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 {
+        bool pr = false;
+
         switch (msr) {
         case MSR_EFER:
                 return set_efer(vcpu, data);
@@ -1635,6 +1637,18 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
                 pr_unimpl(vcpu, "unimplemented perfctr wrmsr: "
                         "0x%x data 0x%llx\n", msr, data);
                 break;
+        case MSR_P6_PERFCTR0:
+        case MSR_P6_PERFCTR1:
+                pr = true;
+        case MSR_P6_EVNTSEL0:
+        case MSR_P6_EVNTSEL1:
+                if (kvm_pmu_msr(vcpu, msr))
+                        return kvm_pmu_set_msr(vcpu, msr, data);
+
+                if (pr || data != 0)
+                        pr_unimpl(vcpu, "disabled perfctr wrmsr: "
+                                "0x%x data 0x%llx\n", msr, data);
+                break;
         case MSR_K7_CLK_CTL:
                 /*
                  * Ignore all writes to this no longer documented MSR.
@@ -1835,6 +1849,14 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
         case MSR_FAM10H_MMIO_CONF_BASE:
                 data = 0;
                 break;
+        case MSR_P6_PERFCTR0:
+        case MSR_P6_PERFCTR1:
+        case MSR_P6_EVNTSEL0:
+        case MSR_P6_EVNTSEL1:
+                if (kvm_pmu_msr(vcpu, msr))
+                        return kvm_pmu_get_msr(vcpu, msr, pdata);
+                data = 0;
+                break;
         case MSR_IA32_UCODE_REV:
                 data = 0x100000000ULL;
                 break;
@@ -4180,6 +4202,28 @@ static int emulator_intercept(struct x86_emulate_ctxt *ctxt,
         return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);
 }
 
+static bool emulator_get_cpuid(struct x86_emulate_ctxt *ctxt,
+                               u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)
+{
+        struct kvm_cpuid_entry2 *cpuid = NULL;
+
+        if (eax && ecx)
+                cpuid = kvm_find_cpuid_entry(emul_to_vcpu(ctxt),
+                                            *eax, *ecx);
+
+        if (cpuid) {
+                *eax = cpuid->eax;
+                *ecx = cpuid->ecx;
+                if (ebx)
+                        *ebx = cpuid->ebx;
+                if (edx)
+                        *edx = cpuid->edx;
+                return true;
+        }
+
+        return false;
+}
+
 static struct x86_emulate_ops emulate_ops = {
         .read_std            = kvm_read_guest_virt_system,
         .write_std           = kvm_write_guest_virt_system,
@@ -4211,6 +4255,7 @@ static struct x86_emulate_ops emulate_ops = {
         .get_fpu             = emulator_get_fpu,
         .put_fpu             = emulator_put_fpu,
         .intercept           = emulator_intercept,
+        .get_cpuid           = emulator_get_cpuid,
 };
 
 static void cache_all_regs(struct kvm_vcpu *vcpu)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 9d74824a708d..f0b4caf85c1a 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -673,7 +673,7 @@ no_context(struct pt_regs *regs, unsigned long error_code,
 
         stackend = end_of_stack(tsk);
         if (tsk != &init_task && *stackend != STACK_END_MAGIC)
-                printk(KERN_ALERT "Thread overran stack, or stack corrupted\n");
+                printk(KERN_EMERG "Thread overran stack, or stack corrupted\n");
 
         tsk->thread.cr2         = address;
         tsk->thread.trap_no     = 14;
@@ -684,7 +684,7 @@ no_context(struct pt_regs *regs, unsigned long error_code,
                 sig = 0;
 
         /* Executive summary in case the body of the oops scrolled away */
-        printk(KERN_EMERG "CR2: %016lx\n", address);
+        printk(KERN_DEFAULT "CR2: %016lx\n", address);
 
         oops_end(flags, regs, sig);
 }
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index cc9b1e182fcf..d69cc6c3f808 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -116,9 +116,26 @@ static inline void spin_time_accum_blocked(u64 start)
 }
 #endif  /* CONFIG_XEN_DEBUG_FS */
 
+/*
+ * Size struct xen_spinlock so it's the same as arch_spinlock_t.
+ */
+#if NR_CPUS < 256
+typedef u8 xen_spinners_t;
+# define inc_spinners(xl) \
+        asm(LOCK_PREFIX " incb %0" : "+m" ((xl)->spinners) : : "memory");
+# define dec_spinners(xl) \
+        asm(LOCK_PREFIX " decb %0" : "+m" ((xl)->spinners) : : "memory");
+#else
+typedef u16 xen_spinners_t;
+# define inc_spinners(xl) \
+        asm(LOCK_PREFIX " incw %0" : "+m" ((xl)->spinners) : : "memory");
+# define dec_spinners(xl) \
+        asm(LOCK_PREFIX " decw %0" : "+m" ((xl)->spinners) : : "memory");
+#endif
+
 struct xen_spinlock {
         unsigned char lock;             /* 0 -> free; 1 -> locked */
-        unsigned short spinners;        /* count of waiting cpus */
+        xen_spinners_t spinners;        /* count of waiting cpus */
 };
 
 static int xen_spin_is_locked(struct arch_spinlock *lock)
@@ -164,8 +181,7 @@ static inline struct xen_spinlock *spinning_lock(struct xen_spinlock *xl)
 
         wmb();                  /* set lock of interest before count */
 
-        asm(LOCK_PREFIX " incw %0"
-            : "+m" (xl->spinners) : : "memory");
+        inc_spinners(xl);
 
         return prev;
 }
@@ -176,8 +192,7 @@ static inline struct xen_spinlock *spinning_lock(struct xen_spinlock *xl)
  */
 static inline void unspinning_lock(struct xen_spinlock *xl, struct xen_spinlock *prev)
 {
-        asm(LOCK_PREFIX " decw %0"
-            : "+m" (xl->spinners) : : "memory");
+        dec_spinners(xl);
         wmb();                  /* decrement count before restoring lock */
         __this_cpu_write(lock_spinners, prev);
 }
@@ -373,6 +388,8 @@ void xen_uninit_lock_cpu(int cpu)
 
 void __init xen_init_spinlocks(void)
 {
+        BUILD_BUG_ON(sizeof(struct xen_spinlock) > sizeof(arch_spinlock_t));
+
         pv_lock_ops.spin_is_locked = xen_spin_is_locked;
         pv_lock_ops.spin_is_contended = xen_spin_is_contended;
         pv_lock_ops.spin_lock = xen_spin_lock;
diff --git a/arch/xtensa/include/asm/string.h b/arch/xtensa/include/asm/string.h
index 5fb8c27cbef5..405a8c49ff2c 100644
--- a/arch/xtensa/include/asm/string.h
+++ b/arch/xtensa/include/asm/string.h
@@ -118,7 +118,4 @@ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
 /* Don't build bcopy at all ...  */
 #define __HAVE_ARCH_BCOPY
 
-#define __HAVE_ARCH_MEMSCAN
-#define memscan memchr
-
 #endif  /* _XTENSA_STRING_H */
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 2b805d7ef317..8ae05ce18500 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -586,13 +586,6 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
         if (pr->flags.need_hotplug_init)
                 return 0;
 
-        /*
-         * Do not start hotplugged CPUs now, but when they
-         * are onlined the first time
-         */
-        if (pr->flags.need_hotplug_init)
-                return 0;
-
         result = acpi_processor_start(pr);
         if (result)
                 goto err_remove_sysfs;
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 2c8272dd93c4..610f9997a403 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the Linux device tree
 
-obj-y                   := core.o sys.o bus.o dd.o syscore.o \
+obj-y                   := core.o bus.o dd.o syscore.o \
                            driver.o class.o platform.o \
                            cpu.o firmware.o init.o map.o devres.o \
                            attribute_container.o transport_class.o \
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 4a67cc0c8b37..74dda4f697f9 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -632,6 +632,11 @@ static void klist_children_put(struct klist_node *n)
  * may be used for reference counting of @dev after calling this
  * function.
  *
+ * All fields in @dev must be initialized by the caller to 0, except
+ * for those explicitly set to some other value.  The simplest
+ * approach is to use kzalloc() to allocate the structure containing
+ * @dev.
+ *
  * NOTE: Use put_device() to give up your reference instead of freeing
  * @dev directly once you have called this function.
  */
@@ -930,6 +935,13 @@ int device_private_init(struct device *dev)
  * to the global and sibling lists for the device, then
  * adds it to the other relevant subsystems of the driver model.
  *
+ * Do not call this routine or device_register() more than once for
+ * any device structure.  The driver model core is not designed to work
+ * with devices that get unregistered and then spring back to life.
+ * (Among other things, it's very hard to guarantee that all references
+ * to the previous incarnation of @dev have been dropped.)  Allocate
+ * and register a fresh new struct device instead.
+ *
  * NOTE: _Never_ directly free @dev after calling this function, even
  * if it returned an error! Always use put_device() to give up your
  * reference instead.
@@ -1022,7 +1034,7 @@ int device_add(struct device *dev)
         device_pm_add(dev);
 
         /* Notify clients of device addition.  This call must come
-         * after dpm_sysf_add() and before kobject_uevent().
+         * after dpm_sysfs_add() and before kobject_uevent().
          */
         if (dev->bus)
                 blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
@@ -1090,6 +1102,9 @@ name_error:
  * have a clearly defined need to use and refcount the device
  * before it is added to the hierarchy.
  *
+ * For more information, see the kerneldoc for device_initialize()
+ * and device_add().
+ *
  * NOTE: _Never_ directly free @dev after calling this function, even
  * if it returned an error! Always use put_device() to give up the
  * reference initialized in this function instead.
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
deleted file mode 100644
index 409f5ce78829..000000000000
--- a/drivers/base/sys.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * sys.c - pseudo-bus for system 'devices' (cpus, PICs, timers, etc)
- *
- * Copyright (c) 2002-3 Patrick Mochel
- *               2002-3 Open Source Development Lab
- *
- * This file is released under the GPLv2
- *
- * This exports a 'system' bus type.
- * By default, a 'sys' bus gets added to the root of the system. There will
- * always be core system devices. Devices can use sysdev_register() to
- * add themselves as children of the system bus.
- */
-
-#include <linux/sysdev.h>
-#include <linux/err.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/pm.h>
-#include <linux/device.h>
-#include <linux/mutex.h>
-#include <linux/interrupt.h>
-
-#include "base.h"
-
-#define to_sysdev(k) container_of(k, struct sys_device, kobj)
-#define to_sysdev_attr(a) container_of(a, struct sysdev_attribute, attr)
-
-
-static ssize_t
-sysdev_show(struct kobject *kobj, struct attribute *attr, char *buffer)
-{
-        struct sys_device *sysdev = to_sysdev(kobj);
-        struct sysdev_attribute *sysdev_attr = to_sysdev_attr(attr);
-
-        if (sysdev_attr->show)
-                return sysdev_attr->show(sysdev, sysdev_attr, buffer);
-        return -EIO;
-}
-
-
-static ssize_t
-sysdev_store(struct kobject *kobj, struct attribute *attr,
-             const char *buffer, size_t count)
-{
-        struct sys_device *sysdev = to_sysdev(kobj);
-        struct sysdev_attribute *sysdev_attr = to_sysdev_attr(attr);
-
-        if (sysdev_attr->store)
-                return sysdev_attr->store(sysdev, sysdev_attr, buffer, count);
-        return -EIO;
-}
-
-static const struct sysfs_ops sysfs_ops = {
-        .show   = sysdev_show,
-        .store  = sysdev_store,
-};
-
-static struct kobj_type ktype_sysdev = {
-        .sysfs_ops      = &sysfs_ops,
-};
-
-
-int sysdev_create_file(struct sys_device *s, struct sysdev_attribute *a)
-{
-        return sysfs_create_file(&s->kobj, &a->attr);
-}
-
-
-void sysdev_remove_file(struct sys_device *s, struct sysdev_attribute *a)
-{
-        sysfs_remove_file(&s->kobj, &a->attr);
-}
-
-EXPORT_SYMBOL_GPL(sysdev_create_file);
-EXPORT_SYMBOL_GPL(sysdev_remove_file);
-
-#define to_sysdev_class(k) container_of(k, struct sysdev_class, kset.kobj)
-#define to_sysdev_class_attr(a) container_of(a, \
-        struct sysdev_class_attribute, attr)
-
-static ssize_t sysdev_class_show(struct kobject *kobj, struct attribute *attr,
-                                 char *buffer)
-{
-        struct sysdev_class *class = to_sysdev_class(kobj);
-        struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);
-
-        if (class_attr->show)
-                return class_attr->show(class, class_attr, buffer);
-        return -EIO;
-}
-
-static ssize_t sysdev_class_store(struct kobject *kobj, struct attribute *attr,
-                                  const char *buffer, size_t count)
-{
-        struct sysdev_class *class = to_sysdev_class(kobj);
-        struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);
-
-        if (class_attr->store)
-                return class_attr->store(class, class_attr, buffer, count);
-        return -EIO;
-}
-
-static const struct sysfs_ops sysfs_class_ops = {
-        .show   = sysdev_class_show,
-        .store  = sysdev_class_store,
-};
-
-static struct kobj_type ktype_sysdev_class = {
-        .sysfs_ops      = &sysfs_class_ops,
-};
-
-int sysdev_class_create_file(struct sysdev_class *c,
-                             struct sysdev_class_attribute *a)
-{
-        return sysfs_create_file(&c->kset.kobj, &a->attr);
-}
-EXPORT_SYMBOL_GPL(sysdev_class_create_file);
-
-void sysdev_class_remove_file(struct sysdev_class *c,
-                              struct sysdev_class_attribute *a)
-{
-        sysfs_remove_file(&c->kset.kobj, &a->attr);
-}
-EXPORT_SYMBOL_GPL(sysdev_class_remove_file);
-
-extern struct kset *system_kset;
-
-int sysdev_class_register(struct sysdev_class *cls)
-{
-        int retval;
-
-        pr_debug("Registering sysdev class '%s'\n", cls->name);
-
-        INIT_LIST_HEAD(&cls->drivers);
-        memset(&cls->kset.kobj, 0x00, sizeof(struct kobject));
-        cls->kset.kobj.parent = &system_kset->kobj;
-        cls->kset.kobj.ktype = &ktype_sysdev_class;
-        cls->kset.kobj.kset = system_kset;
-
-        retval = kobject_set_name(&cls->kset.kobj, "%s", cls->name);
-        if (retval)
-                return retval;
-
-        retval = kset_register(&cls->kset);
-        if (!retval && cls->attrs)
-                retval = sysfs_create_files(&cls->kset.kobj,
-                                            (const struct attribute **)cls->attrs);
-        return retval;
-}
-
-void sysdev_class_unregister(struct sysdev_class *cls)
-{
-        pr_debug("Unregistering sysdev class '%s'\n",
-                 kobject_name(&cls->kset.kobj));
-        if (cls->attrs)
-                sysfs_remove_files(&cls->kset.kobj,
-                                   (const struct attribute **)cls->attrs);
-        kset_unregister(&cls->kset);
-}
-
-EXPORT_SYMBOL_GPL(sysdev_class_register);
-EXPORT_SYMBOL_GPL(sysdev_class_unregister);
-
-static DEFINE_MUTEX(sysdev_drivers_lock);
-
-/*
- * @dev != NULL means that we're unwinding because some drv->add()
- * failed for some reason. You need to grab sysdev_drivers_lock before
- * calling this.
- */
-static void __sysdev_driver_remove(struct sysdev_class *cls,
-                                   struct sysdev_driver *drv,
-                                   struct sys_device *from_dev)
-{
-        struct sys_device *dev = from_dev;
-
-        list_del_init(&drv->entry);
-        if (!cls)
-                return;
-
-        if (!drv->remove)
-                goto kset_put;
-
-        if (dev)
-                list_for_each_entry_continue_reverse(dev, &cls->kset.list,
-                                                     kobj.entry)
-                        drv->remove(dev);
-        else
-                list_for_each_entry(dev, &cls->kset.list, kobj.entry)
-                        drv->remove(dev);
-
-kset_put:
-        kset_put(&cls->kset);
-}
-
-/**
- *      sysdev_driver_register - Register auxiliary driver
- *      @cls:   Device class driver belongs to.
- *      @drv:   Driver.
- *
- *      @drv is inserted into @cls->drivers to be
- *      called on each operation on devices of that class. The refcount
- *      of @cls is incremented.
- */
-int sysdev_driver_register(struct sysdev_class *cls, struct sysdev_driver *drv)
-{
-        struct sys_device *dev = NULL;
-        int err = 0;
-
-        if (!cls) {
-                WARN(1, KERN_WARNING "sysdev: invalid class passed to %s!\n",
-                        __func__);
-                return -EINVAL;
-        }
-
-        /* Check whether this driver has already been added to a class. */
-        if (drv->entry.next && !list_empty(&drv->entry))
-                WARN(1, KERN_WARNING "sysdev: class %s: driver (%p) has already"
-                        " been registered to a class, something is wrong, but "
-                        "will forge on!\n", cls->name, drv);
-
-        mutex_lock(&sysdev_drivers_lock);
-        if (cls && kset_get(&cls->kset)) {
-                list_add_tail(&drv->entry, &cls->drivers);
-
-                /* If devices of this class already exist, tell the driver */
-                if (drv->add) {
-                        list_for_each_entry(dev, &cls->kset.list, kobj.entry) {
-                                err = drv->add(dev);
-                                if (err)
-                                        goto unwind;
-                        }
-                }
-        } else {
-                err = -EINVAL;
-                WARN(1, KERN_ERR "%s: invalid device class\n", __func__);
-        }
-
-        goto unlock;
-
-unwind:
-        __sysdev_driver_remove(cls, drv, dev);
-
-unlock:
-        mutex_unlock(&sysdev_drivers_lock);
-        return err;
-}
-
-/**
- *      sysdev_driver_unregister - Remove an auxiliary driver.
- *      @cls:   Class driver belongs to.
- *      @drv:   Driver.
- */
-void sysdev_driver_unregister(struct sysdev_class *cls,
-                              struct sysdev_driver *drv)
-{
-        mutex_lock(&sysdev_drivers_lock);
-        __sysdev_driver_remove(cls, drv, NULL);
-        mutex_unlock(&sysdev_drivers_lock);
-}
-EXPORT_SYMBOL_GPL(sysdev_driver_register);
-EXPORT_SYMBOL_GPL(sysdev_driver_unregister);
-
-/**
- *      sysdev_register - add a system device to the tree
- *      @sysdev:        device in question
- *
- */
-int sysdev_register(struct sys_device *sysdev)
-{
-        int error;
-        struct sysdev_class *cls = sysdev->cls;
-
-        if (!cls)
-                return -EINVAL;
-
-        pr_debug("Registering sys device of class '%s'\n",
-                 kobject_name(&cls->kset.kobj));
-
-        /* initialize the kobject to 0, in case it had previously been used */
-        memset(&sysdev->kobj, 0x00, sizeof(struct kobject));
-
-        /* Make sure the kset is set */
-        sysdev->kobj.kset = &cls->kset;
-
-        /* Register the object */
-        error = kobject_init_and_add(&sysdev->kobj, &ktype_sysdev, NULL,
-                                     "%s%d", kobject_name(&cls->kset.kobj),
-                                     sysdev->id);
-
-        if (!error) {
-                struct sysdev_driver *drv;
-
-                pr_debug("Registering sys device '%s'\n",
-                         kobject_name(&sysdev->kobj));
-
-                mutex_lock(&sysdev_drivers_lock);
-                /* Generic notification is implicit, because it's that
-                 * code that should have called us.
-                 */
-
-                /* Notify class auxiliary drivers */
-                list_for_each_entry(drv, &cls->drivers, entry) {
-                        if (drv->add)
-                                drv->add(sysdev);
-                }
-                mutex_unlock(&sysdev_drivers_lock);
-                kobject_uevent(&sysdev->kobj, KOBJ_ADD);
-        }
-
-        return error;
-}
-
-void sysdev_unregister(struct sys_device *sysdev)
-{
-        struct sysdev_driver *drv;
-
-        mutex_lock(&sysdev_drivers_lock);
-        list_for_each_entry(drv, &sysdev->cls->drivers, entry) {
-                if (drv->remove)
-                        drv->remove(sysdev);
-        }
-        mutex_unlock(&sysdev_drivers_lock);
-
-        kobject_put(&sysdev->kobj);
-}
-
-EXPORT_SYMBOL_GPL(sysdev_register);
-EXPORT_SYMBOL_GPL(sysdev_unregister);
-
-#define to_ext_attr(x) container_of(x, struct sysdev_ext_attribute, attr)
-
-ssize_t sysdev_store_ulong(struct sys_device *sysdev,
-                           struct sysdev_attribute *attr,
-                           const char *buf, size_t size)
-{
-        struct sysdev_ext_attribute *ea = to_ext_attr(attr);
-        char *end;
-        unsigned long new = simple_strtoul(buf, &end, 0);
-        if (end == buf)
-                return -EINVAL;
-        *(unsigned long *)(ea->var) = new;
-        /* Always return full write size even if we didn't consume all */
-        return size;
-}
-EXPORT_SYMBOL_GPL(sysdev_store_ulong);
-
-ssize_t sysdev_show_ulong(struct sys_device *sysdev,
-                          struct sysdev_attribute *attr,
-                          char *buf)
-{
-        struct sysdev_ext_attribute *ea = to_ext_attr(attr);
-        return snprintf(buf, PAGE_SIZE, "%lx\n", *(unsigned long *)(ea->var));
-}
-EXPORT_SYMBOL_GPL(sysdev_show_ulong);
-
-ssize_t sysdev_store_int(struct sys_device *sysdev,
-                           struct sysdev_attribute *attr,
-                           const char *buf, size_t size)
-{
-        struct sysdev_ext_attribute *ea = to_ext_attr(attr);
-        char *end;
-        long new = simple_strtol(buf, &end, 0);
-        if (end == buf || new > INT_MAX || new < INT_MIN)
-                return -EINVAL;
-        *(int *)(ea->var) = new;
-        /* Always return full write size even if we didn't consume all */
-        return size;
-}
-EXPORT_SYMBOL_GPL(sysdev_store_int);
-
-ssize_t sysdev_show_int(struct sys_device *sysdev,
-                          struct sysdev_attribute *attr,
-                          char *buf)
-{
-        struct sysdev_ext_attribute *ea = to_ext_attr(attr);
-        return snprintf(buf, PAGE_SIZE, "%d\n", *(int *)(ea->var));
-}
-EXPORT_SYMBOL_GPL(sysdev_show_int);
-
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 3fd31dec8c9c..a6278e7e61a0 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -380,6 +380,7 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr,
         rbdc = __rbd_client_find(opt);
         if (rbdc) {
                 ceph_destroy_options(opt);
+                kfree(rbd_opts);
 
                 /* using an existing client */
                 kref_get(&rbdc->kref);
@@ -406,15 +407,15 @@ done_err:
 
 /*
  * Destroy ceph client
+ *
+ * Caller must hold node_lock.
  */
 static void rbd_client_release(struct kref *kref)
 {
         struct rbd_client *rbdc = container_of(kref, struct rbd_client, kref);
 
         dout("rbd_release_client %p\n", rbdc);
-        spin_lock(&node_lock);
         list_del(&rbdc->node);
-        spin_unlock(&node_lock);
 
         ceph_destroy_client(rbdc->client);
         kfree(rbdc->rbd_opts);
@@ -427,7 +428,9 @@ static void rbd_client_release(struct kref *kref)
  */
 static void rbd_put_client(struct rbd_device *rbd_dev)
 {
+        spin_lock(&node_lock);
         kref_put(&rbd_dev->rbd_client->kref, rbd_client_release);
+        spin_unlock(&node_lock);
         rbd_dev->rbd_client = NULL;
         rbd_dev->client = NULL;
 }
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 97f87b29b9f3..f4aed5fc2cb6 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1343,7 +1343,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
 
                 tasklet_init(&atchan->tasklet, atc_tasklet,
                                 (unsigned long)atchan);
-                atc_enable_irq(atchan);
+                atc_enable_chan_irq(atdma, i);
         }
 
         /* set base routines */
@@ -1410,7 +1410,7 @@ static int __exit at_dma_remove(struct platform_device *pdev)
                 struct at_dma_chan      *atchan = to_at_dma_chan(chan);
 
                 /* Disable interrupts */
-                atc_disable_irq(atchan);
+                atc_disable_chan_irq(atdma, chan->chan_id);
                 tasklet_disable(&atchan->tasklet);
 
                 tasklet_kill(&atchan->tasklet);
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
index dcaedfc181cf..a8d3277d60b5 100644
--- a/drivers/dma/at_hdmac_regs.h
+++ b/drivers/dma/at_hdmac_regs.h
@@ -327,28 +327,27 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
 }
 
 
-static void atc_setup_irq(struct at_dma_chan *atchan, int on)
+static void atc_setup_irq(struct at_dma *atdma, int chan_id, int on)
 {
-        struct at_dma   *atdma = to_at_dma(atchan->chan_common.device);
-        u32             ebci;
+        u32 ebci;
 
         /* enable interrupts on buffer transfer completion & error */
-        ebci =    AT_DMA_BTC(atchan->chan_common.chan_id)
-                | AT_DMA_ERR(atchan->chan_common.chan_id);
+        ebci =    AT_DMA_BTC(chan_id)
+                | AT_DMA_ERR(chan_id);
         if (on)
                 dma_writel(atdma, EBCIER, ebci);
         else
                 dma_writel(atdma, EBCIDR, ebci);
 }
 
-static inline void atc_enable_irq(struct at_dma_chan *atchan)
+static void atc_enable_chan_irq(struct at_dma *atdma, int chan_id)
 {
-        atc_setup_irq(atchan, 1);
+        atc_setup_irq(atdma, chan_id, 1);
 }
 
-static inline void atc_disable_irq(struct at_dma_chan *atchan)
+static void atc_disable_chan_irq(struct at_dma *atdma, int chan_id)
 {
-        atc_setup_irq(atchan, 0);
+        atc_setup_irq(atdma, chan_id, 0);
 }
 
 
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index 2b8661b54eaf..24225f0fdcd8 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -599,7 +599,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
         }
         if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
                 cnt = dmatest_add_threads(dtc, DMA_PQ);
-                thread_count += cnt > 0 ?: 0;
+                thread_count += cnt > 0 ? cnt : 0;
         }
 
         pr_info("dmatest: Started %u threads using %s\n",
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index a8af379680c1..8bc5acf36ee5 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1102,11 +1102,13 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
         case DMA_SLAVE_CONFIG:
                 if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
                         sdmac->per_address = dmaengine_cfg->src_addr;
-                        sdmac->watermark_level = dmaengine_cfg->src_maxburst;
+                        sdmac->watermark_level = dmaengine_cfg->src_maxburst *
+                                                dmaengine_cfg->src_addr_width;
                         sdmac->word_size = dmaengine_cfg->src_addr_width;
                 } else {
                         sdmac->per_address = dmaengine_cfg->dst_addr;
-                        sdmac->watermark_level = dmaengine_cfg->dst_maxburst;
+                        sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
+                                                dmaengine_cfg->dst_addr_width;
                         sdmac->word_size = dmaengine_cfg->dst_addr_width;
                 }
                 sdmac->direction = dmaengine_cfg->direction;
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 54043cd831c8..812fd76e9c18 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -1262,7 +1262,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
 
         INIT_LIST_HEAD(&shdev->common.channels);
 
-        dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
+        if (!pdata->slave_only)
+                dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
         if (pdata->slave && pdata->slave_num)
                 dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);
 
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 6628feaa7622..7f5f0da726da 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -263,6 +263,7 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card)
 static char ohci_driver_name[] = KBUILD_MODNAME;
 
 #define PCI_DEVICE_ID_AGERE_FW643       0x5901
+#define PCI_DEVICE_ID_CREATIVE_SB1394   0x4001
 #define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380
 #define PCI_DEVICE_ID_TI_TSB12LV22      0x8009
 #define PCI_DEVICE_ID_TI_TSB12LV26      0x8020
@@ -289,6 +290,9 @@ static const struct {
         {PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_AGERE_FW643, 6,
                 QUIRK_NO_MSI},
 
+        {PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_SB1394, PCI_ANY_ID,
+                QUIRK_RESET_PACKET},
+
         {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID,
                 QUIRK_NO_MSI},
 
@@ -299,7 +303,7 @@ static const struct {
                 QUIRK_NO_MSI},
 
         {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID,
-                QUIRK_CYCLE_TIMER},
+                QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},
 
         {PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID,
                 QUIRK_CYCLE_TIMER | QUIRK_RESET_PACKET | QUIRK_NO_1394A},
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 5b6948081f8f..ddfacc5ce56d 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -96,7 +96,7 @@ static const char *gpio_p2_names[LPC32XX_GPIO_P2_MAX] = {
 };
 
 static const char *gpio_p3_names[LPC32XX_GPIO_P3_MAX] = {
-        "gpi000", "gpio01", "gpio02", "gpio03",
+        "gpio00", "gpio01", "gpio02", "gpio03",
         "gpio04", "gpio05"
 };
 
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 03d6dd5dcb77..f0febe5b8221 100644
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -448,6 +448,7 @@ static int __devinit ioh_gpio_probe(struct pci_dev *pdev,
                 chip->reg = chip->base;
                 chip->ch = i;
                 mutex_init(&chip->lock);
+                spin_lock_init(&chip->spinlock);
                 ioh_gpio_setup(chip, num_ports[i]);
                 ret = gpiochip_add(&chip->gpio);
                 if (ret) {
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index 68fa55e86eb1..e8729cc2ba2b 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -392,6 +392,7 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
         chip->reg = chip->base;
         pci_set_drvdata(pdev, chip);
         mutex_init(&chip->lock);
+        spin_lock_init(&chip->spinlock);
         pch_gpio_setup(chip);
         ret = gpiochip_add(&chip->gpio);
         if (ret) {
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index a7661773c052..0a79a1167a25 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -2387,27 +2387,30 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
 };
 
 #if defined(CONFIG_ARCH_EXYNOS4) && defined(CONFIG_OF)
-static int exynos4_gpio_xlate(struct gpio_chip *gc, struct device_node *np,
-                              const void *gpio_spec, u32 *flags)
+static int exynos4_gpio_xlate(struct gpio_chip *gc,
+                        const struct of_phandle_args *gpiospec, u32 *flags)
 {
-        const __be32 *gpio = gpio_spec;
-        const u32 n = be32_to_cpup(gpio);
-        unsigned int pin = gc->base + be32_to_cpu(gpio[0]);
+        unsigned int pin;
 
         if (WARN_ON(gc->of_gpio_n_cells < 4))
                 return -EINVAL;
 
-        if (n > gc->ngpio)
+        if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
                 return -EINVAL;
 
-        if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(be32_to_cpu(gpio[1]))))
+        if (gpiospec->args[0] > gc->ngpio)
+                return -EINVAL;
+
+        pin = gc->base + gpiospec->args[0];
+
+        if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(gpiospec->args[1])))
                 pr_warn("gpio_xlate: failed to set pin function\n");
-        if (s3c_gpio_setpull(pin, be32_to_cpu(gpio[2])))
+        if (s3c_gpio_setpull(pin, gpiospec->args[2]))
                 pr_warn("gpio_xlate: failed to set pin pull up/down\n");
-        if (s5p_gpio_set_drvstr(pin, be32_to_cpu(gpio[3])))
+        if (s5p_gpio_set_drvstr(pin, gpiospec->args[3]))
                 pr_warn("gpio_xlate: failed to set pin drive strength\n");
 
-        return n;
+        return gpiospec->args[0];
 }
 
 static const struct of_device_id exynos4_gpio_dt_match[] __initdata = {
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 396e60ce8114..f8625e290728 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -140,7 +140,7 @@ int drm_gem_object_init(struct drm_device *dev,
         obj->dev = dev;
         obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
         if (IS_ERR(obj->filp))
-                return -ENOMEM;
+                return PTR_ERR(obj->filp);
 
         kref_init(&obj->refcount);
         atomic_set(&obj->handle_count, 0);
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index f7c17b239833..7f4b4e10246e 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -886,7 +886,7 @@ static int i810_flush_queue(struct drm_device *dev)
 }
 
 /* Must be called with the lock held */
-void i810_driver_reclaim_buffers(struct drm_device *dev,
+static void i810_reclaim_buffers(struct drm_device *dev,
                                  struct drm_file *file_priv)
 {
         struct drm_device_dma *dma = dev->dma;
@@ -1223,17 +1223,12 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
                 if (dev_priv->page_flipping)
                         i810_do_cleanup_pageflip(dev);
         }
+}
 
-        if (file_priv->master && file_priv->master->lock.hw_lock) {
-                drm_idlelock_take(&file_priv->master->lock);
-                i810_driver_reclaim_buffers(dev, file_priv);
-                drm_idlelock_release(&file_priv->master->lock);
-        } else {
-                /* master disappeared, clean up stuff anyway and hope nothing
-                 * goes wrong */
-                i810_driver_reclaim_buffers(dev, file_priv);
-        }
-
+void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                        struct drm_file *file_priv)
+{
+        i810_reclaim_buffers(dev, file_priv);
 }
 
 int i810_driver_dma_quiescent(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 053f1ee58393..ec12f7dc717a 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -63,6 +63,7 @@ static struct drm_driver driver = {
         .lastclose = i810_driver_lastclose,
         .preclose = i810_driver_preclose,
         .device_is_agp = i810_driver_device_is_agp,
+        .reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,
         .dma_quiescent = i810_driver_dma_quiescent,
         .ioctls = i810_ioctls,
         .fops = &i810_driver_fops,
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index 6e0acad9e0f5..c9339f481795 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -116,12 +116,14 @@ typedef struct drm_i810_private {
 
                                 /* i810_dma.c */
 extern int i810_driver_dma_quiescent(struct drm_device *dev);
-void i810_driver_reclaim_buffers(struct drm_device *dev,
-                                 struct drm_file *file_priv);
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                               struct drm_file *file_priv);
 extern int i810_driver_load(struct drm_device *, unsigned long flags);
 extern void i810_driver_lastclose(struct drm_device *dev);
 extern void i810_driver_preclose(struct drm_device *dev,
                                  struct drm_file *file_priv);
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                               struct drm_file *file_priv);
 extern int i810_driver_device_is_agp(struct drm_device *dev);
 
 extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index 1e382ad5a2b8..a37c31e358aa 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -54,9 +54,10 @@ struct bit_entry {
 int bit_table(struct drm_device *, u8 id, struct bit_entry *);
 
 enum dcb_gpio_tag {
-        DCB_GPIO_TVDAC0 = 0xc,
+        DCB_GPIO_PANEL_POWER = 0x01,
+        DCB_GPIO_TVDAC0 = 0x0c,
         DCB_GPIO_TVDAC1 = 0x2d,
-        DCB_GPIO_PWM_FAN = 0x9,
+        DCB_GPIO_PWM_FAN = 0x09,
         DCB_GPIO_FAN_SENSE = 0x3d,
         DCB_GPIO_UNUSED = 0xff
 };
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 3cb52bc52b21..795a9e3c990a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -219,6 +219,16 @@ nouveau_display_init(struct drm_device *dev)
         if (ret)
                 return ret;
 
+        /* power on internal panel if it's not already.  the init tables of
+         * some vbios default this to off for some reason, causing the
+         * panel to not work after resume
+         */
+        if (nouveau_gpio_func_get(dev, DCB_GPIO_PANEL_POWER) == 0) {
+                nouveau_gpio_func_set(dev, DCB_GPIO_PANEL_POWER, true);
+                msleep(300);
+        }
+
+        /* enable polling for external displays */
         drm_kms_helper_poll_enable(dev);
 
         /* enable hotplug interrupts */
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index e4a7cfe7898d..81d7962e7252 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -124,7 +124,7 @@ MODULE_PARM_DESC(ctxfw, "Use external HUB/GPC ucode (fermi)\n");
 int nouveau_ctxfw;
 module_param_named(ctxfw, nouveau_ctxfw, int, 0400);
 
-MODULE_PARM_DESC(ctxfw, "Santise DCB table according to MXM-SIS\n");
+MODULE_PARM_DESC(mxmdcb, "Santise DCB table according to MXM-SIS\n");
 int nouveau_mxmdcb = 1;
 module_param_named(mxmdcb, nouveau_mxmdcb, int, 0400);
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 5f0bc57fdaab..7ce3fde40743 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -380,6 +380,25 @@ retry:
 }
 
 static int
+validate_sync(struct nouveau_channel *chan, struct nouveau_bo *nvbo)
+{
+        struct nouveau_fence *fence = NULL;
+        int ret = 0;
+
+        spin_lock(&nvbo->bo.bdev->fence_lock);
+        if (nvbo->bo.sync_obj)
+                fence = nouveau_fence_ref(nvbo->bo.sync_obj);
+        spin_unlock(&nvbo->bo.bdev->fence_lock);
+
+        if (fence) {
+                ret = nouveau_fence_sync(fence, chan);
+                nouveau_fence_unref(&fence);
+        }
+
+        return ret;
+}
+
+static int
 validate_list(struct nouveau_channel *chan, struct list_head *list,
               struct drm_nouveau_gem_pushbuf_bo *pbbo, uint64_t user_pbbo_ptr)
 {
@@ -393,7 +412,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,
         list_for_each_entry(nvbo, list, entry) {
                 struct drm_nouveau_gem_pushbuf_bo *b = &pbbo[nvbo->pbbo_index];
 
-                ret = nouveau_fence_sync(nvbo->bo.sync_obj, chan);
+                ret = validate_sync(chan, nvbo);
                 if (unlikely(ret)) {
                         NV_ERROR(dev, "fail pre-validate sync\n");
                         return ret;
@@ -416,7 +435,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,
                         return ret;
                 }
 
-                ret = nouveau_fence_sync(nvbo->bo.sync_obj, chan);
+                ret = validate_sync(chan, nvbo);
                 if (unlikely(ret)) {
                         NV_ERROR(dev, "fail post-validate sync\n");
                         return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_mxm.c b/drivers/gpu/drm/nouveau/nouveau_mxm.c
index 8bccddf4eff0..e5a64f0f4cb7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mxm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mxm.c
@@ -656,7 +656,16 @@ nouveau_mxm_init(struct drm_device *dev)
 
         if (mxm_shadow(dev, mxm[0])) {
                 MXM_MSG(dev, "failed to locate valid SIS\n");
+#if 0
+                /* we should, perhaps, fall back to some kind of limited
+                 * mode here if the x86 vbios hasn't already done the
+                 * work for us (so we prevent loading with completely
+                 * whacked vbios tables).
+                 */
                 return -EINVAL;
+#else
+                return 0;
+#endif
         }
 
         MXM_MSG(dev, "MXMS Version %d.%d\n",
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index 03937212e9d8..ec5481dfcd82 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -495,9 +495,9 @@ nv50_pm_clocks_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl)
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nv50_pm_state *info;
         struct pll_lims pll;
-        int ret = -EINVAL;
+        int clk, ret = -EINVAL;
         int N, M, P1, P2;
-        u32 clk, out;
+        u32 out;
 
         if (dev_priv->chipset == 0xaa ||
             dev_priv->chipset == 0xac)
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 891935271d34..742f17f009a9 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1184,7 +1184,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(EVERGREEN_GRPH_ENABLE + radeon_crtc->crtc_offset, 1);
 
         WREG32(EVERGREEN_DESKTOP_HEIGHT + radeon_crtc->crtc_offset,
-               crtc->mode.vdisplay);
+               target_fb->height);
         x &= ~3;
         y &= ~1;
         WREG32(EVERGREEN_VIEWPORT_START + radeon_crtc->crtc_offset,
@@ -1353,7 +1353,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1);
 
         WREG32(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset,
-               crtc->mode.vdisplay);
+               target_fb->height);
         x &= ~3;
         y &= ~1;
         WREG32(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset,
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index a71557ce01dc..552b436451fd 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -564,9 +564,21 @@ int radeon_dp_get_panel_mode(struct drm_encoder *encoder,
             ENCODER_OBJECT_ID_NUTMEG)
                 panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;
         else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==
-                 ENCODER_OBJECT_ID_TRAVIS)
-                panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
-        else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
+                 ENCODER_OBJECT_ID_TRAVIS) {
+                u8 id[6];
+                int i;
+                for (i = 0; i < 6; i++)
+                        id[i] = radeon_read_dpcd_reg(radeon_connector, 0x503 + i);
+                if (id[0] == 0x73 &&
+                    id[1] == 0x69 &&
+                    id[2] == 0x76 &&
+                    id[3] == 0x61 &&
+                    id[4] == 0x72 &&
+                    id[5] == 0x54)
+                        panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;
+                else
+                        panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
+        } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
                 u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP);
                 if (tmp & 1)
                         panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
index d996f4381130..accc032c103f 100644
--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
@@ -468,27 +468,42 @@ set_default_state(struct radeon_device *rdev)
         radeon_ring_write(ring, sq_stack_resource_mgmt_2);
 }
 
+#define I2F_MAX_BITS 15
+#define I2F_MAX_INPUT  ((1 << I2F_MAX_BITS) - 1)
+#define I2F_SHIFT (24 - I2F_MAX_BITS)
+
+/*
+ * Converts unsigned integer into 32-bit IEEE floating point representation.
+ * Conversion is not universal and only works for the range from 0
+ * to 2^I2F_MAX_BITS-1. Currently we only use it with inputs between
+ * 0 and 16384 (inclusive), so I2F_MAX_BITS=15 is enough. If necessary,
+ * I2F_MAX_BITS can be increased, but that will add to the loop iterations
+ * and slow us down. Conversion is done by shifting the input and counting
+ * down until the first 1 reaches bit position 23. The resulting counter
+ * and the shifted input are, respectively, the exponent and the fraction.
+ * The sign is always zero.
+ */
 static uint32_t i2f(uint32_t input)
 {
         u32 result, i, exponent, fraction;
 
-        if ((input & 0x3fff) == 0)
-                result = 0; /* 0 is a special case */
+        WARN_ON_ONCE(input > I2F_MAX_INPUT);
+
+        if ((input & I2F_MAX_INPUT) == 0)
+                result = 0;
         else {
-                exponent = 140; /* exponent biased by 127; */
-                fraction = (input & 0x3fff) << 10; /* cheat and only
-                                                      handle numbers below 2^^15 */
-                for (i = 0; i < 14; i++) {
+                exponent = 126 + I2F_MAX_BITS;
+                fraction = (input & I2F_MAX_INPUT) << I2F_SHIFT;
+
+                for (i = 0; i < I2F_MAX_BITS; i++) {
                         if (fraction & 0x800000)
                                 break;
                         else {
-                                fraction = fraction << 1; /* keep
-                                                             shifting left until top bit = 1 */
+                                fraction = fraction << 1;
                                 exponent = exponent - 1;
                         }
                 }
-                result = exponent << 23 | (fraction & 0x7fffff); /* mask
-                                                                    off top bit; assumed 1 */
+                result = exponent << 23 | (fraction & 0x7fffff);
         }
         return result;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 13ac63ba6075..98724fcb0088 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -59,8 +59,9 @@ static int radeon_atrm_call(acpi_handle atrm_handle, uint8_t *bios,
 
         obj = (union acpi_object *)buffer.pointer;
         memcpy(bios+offset, obj->buffer.pointer, obj->buffer.length);
+        len = obj->buffer.length;
         kfree(buffer.pointer);
-        return obj->buffer.length;
+        return len;
 }
 
 bool radeon_atrm_supported(struct pci_dev *pdev)
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index cec51a5b69dd..49f7cb7e226b 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -883,6 +883,8 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
         if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
                 return 0;
 
+        drm_kms_helper_poll_disable(dev);
+
         /* turn off display hw */
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
@@ -972,6 +974,8 @@ int radeon_resume_kms(struct drm_device *dev)
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
         }
+
+        drm_kms_helper_poll_enable(dev);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index 7bb1b079f480..98a8ad680109 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -897,6 +897,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
         i2c->rec = *rec;
         i2c->adapter.owner = THIS_MODULE;
         i2c->adapter.class = I2C_CLASS_DDC;
+        i2c->adapter.dev.parent = &dev->pdev->dev;
         i2c->dev = dev;
         i2c_set_adapdata(&i2c->adapter, i2c);
         if (rec->mm_i2c ||
@@ -957,6 +958,7 @@ struct radeon_i2c_chan *radeon_i2c_create_dp(struct drm_device *dev,
         i2c->rec = *rec;
         i2c->adapter.owner = THIS_MODULE;
         i2c->adapter.class = I2C_CLASS_DDC;
+        i2c->adapter.dev.parent = &dev->pdev->dev;
         i2c->dev = dev;
         snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),
                  "Radeon aux bus %s", name);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 0af6ebdf205d..b66ef0e3cde1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -378,7 +378,7 @@ int vmw_framebuffer_create_handle(struct drm_framebuffer *fb,
                                   unsigned int *handle)
 {
         if (handle)
-                handle = 0;
+                *handle = 0;
 
         return 0;
 }
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index 0c33ae9cf0f0..406632472c1b 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -548,6 +548,7 @@ static int mousevsc_remove(struct hv_device *dev)
         struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
 
         vmbus_close(dev->channel);
+        hid_hw_stop(input_dev->hid_device);
         hid_destroy_device(input_dev->hid_device);
         mousevsc_free_device(input_dev);
 
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index b47e58b52d9f..acab74cde727 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -531,7 +531,6 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
 
         ret = power_supply_register(&hdev->dev, &wdata->battery);
         if (ret) {
@@ -540,6 +539,8 @@ static int wacom_probe(struct hid_device *hdev,
                 goto err_battery;
         }
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         wdata->ac.properties = wacom_ac_props;
         wdata->ac.num_properties = ARRAY_SIZE(wacom_ac_props);
         wdata->ac.get_property = wacom_ac_get_property;
@@ -547,14 +548,14 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->ac.type = POWER_SUPPLY_TYPE_MAINS;
         wdata->ac.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
-
         ret = power_supply_register(&hdev->dev, &wdata->ac);
         if (ret) {
                 hid_warn(hdev,
                          "can't create ac battery attribute, err: %d\n", ret);
                 goto err_ac;
         }
+
+        power_supply_powers(&wdata->ac, &hdev->dev);
 #endif
         return 0;
 
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index fc253b472f9d..cac3589b1ed5 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c
@@ -1226,14 +1226,14 @@ static int wiimote_hid_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
-
         ret = power_supply_register(&wdata->hdev->dev, &wdata->battery);
         if (ret) {
                 hid_err(hdev, "Cannot register battery device\n");
                 goto err_battery;
         }
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         ret = wiimote_leds_create(wdata);
         if (ret)
                 goto err_free;
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 7c297d305d5d..b1ec0e2aeb57 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -922,11 +922,11 @@ void hiddev_disconnect(struct hid_device *hid)
         struct hiddev *hiddev = hid->hiddev;
         struct usbhid_device *usbhid = hid->driver_data;
 
+        usb_deregister_dev(usbhid->intf, &hiddev_class);
+
         mutex_lock(&hiddev->existancelock);
         hiddev->exist = 0;
 
-        usb_deregister_dev(usbhid->intf, &hiddev_class);
-
         if (hiddev->open) {
                 mutex_unlock(&hiddev->existancelock);
                 usbhid_close(hiddev->hid);
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 92f949767ece..6dbfd3e516e4 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -283,11 +283,11 @@ static inline long temp_from_reg(u8 reg)
 
 static inline u8 temp_to_reg(long val)
 {
-        if (val < 0)
-                val = 0;
-        else if (val > 1000 * 0xff)
-                val = 0xff;
-        return ((val + 500) / 1000);
+        if (val <= 0)
+                return 0;
+        if (val >= 1000 * 0xff)
+                return 0xff;
+        return (val + 500) / 1000;
 }
 
 /*
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 6ddeae049058..91fdd1fe18b0 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -883,7 +883,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb,
 
 static int __devinit sht15_probe(struct platform_device *pdev)
 {
-        int ret = 0;
+        int ret;
         struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL);
         u8 status = 0;
 
@@ -901,6 +901,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
         init_waitqueue_head(&data->wait_queue);
 
         if (pdev->dev.platform_data == NULL) {
+                ret = -EINVAL;
                 dev_err(&pdev->dev, "no platform data supplied\n");
                 goto err_free_data;
         }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 0e0af0445222..4d383e7e051d 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1319,6 +1319,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
 {
         struct w83627ehf_data *data = dev_get_drvdata(dev);
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        struct w83627ehf_sio_data *sio_data = dev->platform_data;
         int nr = sensor_attr->index;
         unsigned long val;
         int err;
@@ -1330,6 +1331,11 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
 
         if (val > 1)
                 return -EINVAL;
+
+        /* On NCT67766F, DC mode is only supported for pwm1 */
+        if (sio_data->kind == nct6776 && nr && val != 1)
+                return -EINVAL;
+
         mutex_lock(&data->update_lock);
         reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]);
         data->pwm_mode[nr] = val;
@@ -1914,9 +1920,26 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
                 fan4min = 0;
                 fan5pin = 0;
         } else if (sio_data->kind == nct6776) {
-                fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
-                fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
-                fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
+                bool gpok = superio_inb(sio_data->sioreg, 0x27) & 0x80;
+
+                superio_select(sio_data->sioreg, W83627EHF_LD_HWM);
+                regval = superio_inb(sio_data->sioreg, SIO_REG_ENABLE);
+
+                if (regval & 0x80)
+                        fan3pin = gpok;
+                else
+                        fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
+
+                if (regval & 0x40)
+                        fan4pin = gpok;
+                else
+                        fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
+
+                if (regval & 0x20)
+                        fan5pin = gpok;
+                else
+                        fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
+
                 fan4min = fan4pin;
         } else if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
                 fan3pin = 1;
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index b37b0c02a7b9..5034a87cc72d 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -808,9 +808,12 @@ static ssize_t ucma_accept(struct ucma_file *file, const char __user *inbuf,
                 return PTR_ERR(ctx);
 
         if (cmd.conn_param.valid) {
-                ctx->uid = cmd.uid;
                 ucma_copy_conn_param(&conn_param, &cmd.conn_param);
+                mutex_lock(&file->mut);
                 ret = rdma_accept(ctx->cm_id, &conn_param);
+                if (!ret)
+                        ctx->uid = cmd.uid;
+                mutex_unlock(&file->mut);
         } else
                 ret = rdma_accept(ctx->cm_id, NULL);
 
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index b930da4c0c63..4d27e4c3fe34 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1485,6 +1485,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
                 qp->event_handler = attr.event_handler;
                 qp->qp_context    = attr.qp_context;
                 qp->qp_type       = attr.qp_type;
+                atomic_set(&qp->usecnt, 0);
                 atomic_inc(&pd->usecnt);
                 atomic_inc(&attr.send_cq->usecnt);
                 if (attr.recv_cq)
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 602b1bd723a9..575b78045aaf 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -421,6 +421,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd,
                 qp->uobject    = NULL;
                 qp->qp_type    = qp_init_attr->qp_type;
 
+                atomic_set(&qp->usecnt, 0);
                 if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {
                         qp->event_handler = __ib_shared_qp_event_handler;
                         qp->qp_context = qp;
@@ -430,7 +431,6 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd,
                         qp->xrcd = qp_init_attr->xrcd;
                         atomic_inc(&qp_init_attr->xrcd->usecnt);
                         INIT_LIST_HEAD(&qp->open_list);
-                        atomic_set(&qp->usecnt, 0);
 
                         real_qp = qp;
                         qp = __ib_open_qp(real_qp, qp_init_attr->event_handler,
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index b7d4216db3c3..a4de9d58e9b4 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -89,7 +89,7 @@ static int create_file(const char *name, umode_t mode,
                 error = ipathfs_mknod(parent->d_inode, *dentry,
                                       mode, fops, data);
         else
-                error = PTR_ERR(dentry);
+                error = PTR_ERR(*dentry);
         mutex_unlock(&parent->d_inode->i_mutex);
 
         return error;
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 95c94d8f0254..259b0670b51c 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -257,12 +257,9 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
                         return IB_MAD_RESULT_SUCCESS;
 
                 /*
-                 * Don't process SMInfo queries or vendor-specific
-                 * MADs -- the SMA can't handle them.
+                 * Don't process SMInfo queries -- the SMA can't handle them.
                  */
-                if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO ||
-                    ((in_mad->mad_hdr.attr_id & IB_SMP_ATTR_VENDOR_MASK) ==
-                     IB_SMP_ATTR_VENDOR_MASK))
+                if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO)
                         return IB_MAD_RESULT_SUCCESS;
         } else if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT ||
                    in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS1   ||
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 7013da5e9eda..7140199f562e 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index 568b4f11380a..c438e4691b3c 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 425065b36b8c..a4972abedef1 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -233,6 +233,7 @@ static int send_mpa_reject(struct nes_cm_node *cm_node)
         u8 *start_ptr = &start_addr;
         u8 **start_buff = &start_ptr;
         u16 buff_len = 0;
+        struct ietf_mpa_v1 *mpa_frame;
 
         skb = dev_alloc_skb(MAX_CM_BUFFER);
         if (!skb) {
@@ -242,6 +243,8 @@ static int send_mpa_reject(struct nes_cm_node *cm_node)
 
         /* send an MPA reject frame */
         cm_build_mpa_frame(cm_node, start_buff, &buff_len, NULL, MPA_KEY_REPLY);
+        mpa_frame = (struct ietf_mpa_v1 *)*start_buff;
+        mpa_frame->flags |= IETF_MPA_FLAGS_REJECT;
         form_cm_frame(skb, cm_node, NULL, 0, *start_buff, buff_len, SET_ACK | SET_FIN);
 
         cm_node->state = NES_CM_STATE_FIN_WAIT1;
@@ -1360,8 +1363,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
                                 if (!memcmp(nesadapter->arp_table[arpindex].mac_addr,
                                             neigh->ha, ETH_ALEN)) {
                                         /* Mac address same as in nes_arp_table */
-                                        ip_rt_put(rt);
-                                        return rc;
+                                        goto out;
                                 }
 
                                 nes_manage_arp_cache(nesvnic->netdev,
@@ -1377,6 +1379,8 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
                         neigh_event_send(neigh, NULL);
                 }
         }
+
+out:
         rcu_read_unlock();
         ip_rt_put(rt);
         return rc;
diff --git a/drivers/infiniband/hw/nes/nes_cm.h b/drivers/infiniband/hw/nes/nes_cm.h
index bdfa1fbb35fc..4646e6666087 100644
--- a/drivers/infiniband/hw/nes/nes_cm.h
+++ b/drivers/infiniband/hw/nes/nes_cm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_context.h b/drivers/infiniband/hw/nes/nes_context.h
index b4393a16099d..a69eef16d72d 100644
--- a/drivers/infiniband/hw/nes/nes_context.h
+++ b/drivers/infiniband/hw/nes/nes_context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 055f4b545df0..d42c9f435b1b 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
index 0b590e152c6a..d748e4b31b8d 100644
--- a/drivers/infiniband/hw/nes/nes_hw.h
+++ b/drivers/infiniband/hw/nes/nes_hw.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+* Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
 *
 * This software is available to you under a choice of one of two
 * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
index b3b2a240c6e9..3ba7be369452 100644
--- a/drivers/infiniband/hw/nes/nes_mgt.c
+++ b/drivers/infiniband/hw/nes/nes_mgt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel-NE, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_mgt.h b/drivers/infiniband/hw/nes/nes_mgt.h
index 8c8af254555a..4f7f701c4a81 100644
--- a/drivers/infiniband/hw/nes/nes_mgt.h
+++ b/drivers/infiniband/hw/nes/nes_mgt.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2010 Intel-NE, Inc.  All rights reserved.
+* Copyright (c) 2006 - 2011 Intel-NE, Inc.  All rights reserved.
 *
 * This software is available to you under a choice of one of two
 * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 4b3fa711a247..f3a3ecf8d09e 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_user.h b/drivers/infiniband/hw/nes/nes_user.h
index 71e133ab209b..4926de744488 100644
--- a/drivers/infiniband/hw/nes/nes_user.h
+++ b/drivers/infiniband/hw/nes/nes_user.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Cisco Systems.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c
index 8b4c2ff54888..e98f4fc0b768 100644
--- a/drivers/infiniband/hw/nes/nes_utils.c
+++ b/drivers/infiniband/hw/nes/nes_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 5095bc41c6cc..0927b5cc65d3 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -3428,6 +3428,8 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                                             NES_IWARP_SQ_FMR_WQE_LENGTH_LOW_IDX,
                                             ib_wr->wr.fast_reg.length);
                         set_wqe_32bit_value(wqe->wqe_words,
+                                            NES_IWARP_SQ_FMR_WQE_LENGTH_HIGH_IDX, 0);
+                        set_wqe_32bit_value(wqe->wqe_words,
                                             NES_IWARP_SQ_FMR_WQE_MR_STAG_IDX,
                                             ib_wr->wr.fast_reg.rkey);
                         /* Set page size: */
@@ -3724,7 +3726,7 @@ static int nes_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry)
                                                 entry->opcode = IB_WC_SEND;
                                                 break;
                                         case NES_IWARP_SQ_OP_LOCINV:
-                                                entry->opcode = IB_WR_LOCAL_INV;
+                                                entry->opcode = IB_WC_LOCAL_INV;
                                                 break;
                                         case NES_IWARP_SQ_OP_FAST_REG:
                                                 entry->opcode = IB_WC_FAST_REG_MR;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.h b/drivers/infiniband/hw/nes/nes_verbs.h
index fe6b6e92fa90..0eff7c44d76b 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.h
+++ b/drivers/infiniband/hw/nes/nes_verbs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 4f18e2d332df..d0c64d514813 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -2105,7 +2105,7 @@ static void alloc_dummy_hdrq(struct qib_devdata *dd)
         dd->cspec->dummy_hdrq = dma_alloc_coherent(&dd->pcidev->dev,
                                         dd->rcd[0]->rcvhdrq_size,
                                         &dd->cspec->dummy_hdrq_phys,
-                                        GFP_KERNEL | __GFP_COMP);
+                                        GFP_ATOMIC | __GFP_COMP);
         if (!dd->cspec->dummy_hdrq) {
                 qib_devinfo(dd->pcidev, "Couldn't allocate dummy hdrq\n");
                 /* fallback to just 0'ing */
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index f695061d688e..0fde788e1100 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -560,7 +560,7 @@ static int qib_tune_pcie_coalesce(struct qib_devdata *dd)
  * BIOS may not set PCIe bus-utilization parameters for best performance.
  * Check and optionally adjust them to maximize our throughput.
  */
-static int qib_pcie_caps = 0x51;
+static int qib_pcie_caps;
 module_param_named(pcie_caps, qib_pcie_caps, int, S_IRUGO);
 MODULE_PARM_DESC(pcie_caps, "Max PCIe tuning: Payload (0..3), ReadReq (4..7)");
 
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index cd5d05e22a77..2b73d43cd691 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -69,8 +69,8 @@ MODULE_LICENSE("Dual BSD/GPL");
  */
 
 static u64 srpt_service_guid;
-static spinlock_t srpt_dev_lock;       /* Protects srpt_dev_list. */
-static struct list_head srpt_dev_list; /* List of srpt_device structures. */
+static DEFINE_SPINLOCK(srpt_dev_lock);  /* Protects srpt_dev_list. */
+static LIST_HEAD(srpt_dev_list);        /* List of srpt_device structures. */
 
 static unsigned srp_max_req_size = DEFAULT_MAX_REQ_SIZE;
 module_param(srp_max_req_size, int, 0444);
@@ -687,6 +687,7 @@ err:
         while (--i >= 0)
                 srpt_free_ioctx(sdev, ring[i], dma_size, dir);
         kfree(ring);
+        ring = NULL;
 out:
         return ring;
 }
@@ -2595,7 +2596,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
         }
 
         ch->sess = transport_init_session();
-        if (!ch->sess) {
+        if (IS_ERR(ch->sess)) {
                 rej->reason = __constant_cpu_to_be32(
                                 SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
                 pr_debug("Failed to create session\n");
@@ -3264,8 +3265,7 @@ static void srpt_add_one(struct ib_device *device)
         for (i = 0; i < sdev->srq_size; ++i)
                 srpt_post_recv(sdev, sdev->ioctx_ring[i]);
 
-        WARN_ON(sdev->device->phys_port_cnt
-                > sizeof(sdev->port)/sizeof(sdev->port[0]));
+        WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));
 
         for (i = 1; i <= sdev->device->phys_port_cnt; i++) {
                 sport = &sdev->port[i - 1];
@@ -4010,13 +4010,10 @@ static int __init srpt_init_module(void)
                 goto out;
         }
 
-        spin_lock_init(&srpt_dev_lock);
-        INIT_LIST_HEAD(&srpt_dev_list);
-
-        ret = -ENODEV;
         srpt_target = target_fabric_configfs_init(THIS_MODULE, "srpt");
-        if (!srpt_target) {
+        if (IS_ERR(srpt_target)) {
                 printk(KERN_ERR "couldn't register\n");
+                ret = PTR_ERR(srpt_target);
                 goto out;
         }
 
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h
index b4b4bbcd7f16..61e52b830816 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.h
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
@@ -35,7 +35,6 @@
 #ifndef IB_SRPT_H
 #define IB_SRPT_H
 
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/wait.h>
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 76457d50bc34..afc166fcc3d9 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -386,7 +386,7 @@ static ssize_t evdev_read(struct file *file, char __user *buffer,
         struct evdev_client *client = file->private_data;
         struct evdev *evdev = client->evdev;
         struct input_event event;
-        int retval;
+        int retval = 0;
 
         if (count < input_event_size())
                 return -EINVAL;
diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index a588578037eb..67bec14e8b96 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -34,7 +34,6 @@
 #include <linux/i2c/twl.h>
 #include <linux/slab.h>
 
-
 /*
  * The TWL4030 family chips include a keypad controller that supports
  * up to an 8x8 switch matrix.  The controller can issue system wakeup
@@ -302,7 +301,7 @@ static int __devinit twl4030_kp_program(struct twl4030_keypad *kp)
         if (twl4030_kpwrite_u8(kp, i, KEYP_DEB) < 0)
                 return -EIO;
 
-        /* Set timeout period to 100 ms */
+        /* Set timeout period to 200 ms */
         i = KEYP_PERIOD_US(200000, PTV_PRESCALER);
         if (twl4030_kpwrite_u8(kp, (i & 0xFF), KEYP_TIMEOUT_L) < 0)
                 return -EIO;
@@ -466,4 +465,3 @@ MODULE_AUTHOR("Texas Instruments");
 MODULE_DESCRIPTION("TWL4030 Keypad Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:twl4030_keypad");
-
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index b4cfc6c8be89..5ec774d6c82b 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -512,6 +512,13 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
                 },
         },
+        {
+                /* Lenovo Ideapad U455 */
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "20046"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 8250299fd64f..4494233d331a 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -164,7 +164,8 @@ static ssize_t serio_raw_read(struct file *file, char __user *buffer,
         struct serio_raw_client *client = file->private_data;
         struct serio_raw *serio_raw = client->serio_raw;
         char uninitialized_var(c);
-        ssize_t retval = 0;
+        ssize_t read = 0;
+        int retval;
 
         if (serio_raw->dead)
                 return -ENODEV;
@@ -180,13 +181,15 @@ static ssize_t serio_raw_read(struct file *file, char __user *buffer,
         if (serio_raw->dead)
                 return -ENODEV;
 
-        while (retval < count && serio_raw_fetch_byte(serio_raw, &c)) {
-                if (put_user(c, buffer++))
-                        return -EFAULT;
-                retval++;
+        while (read < count && serio_raw_fetch_byte(serio_raw, &c)) {
+                if (put_user(c, buffer++)) {
+                        retval = -EFAULT;
+                        break;
+                }
+                read++;
         }
 
-        return retval;
+        return read ?: retval;
 }
 
 static ssize_t serio_raw_write(struct file *file, const char __user *buffer,
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index cce1f03b8895..f75e0608be5b 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2863,6 +2863,9 @@ static unsigned device_dma_ops_init(void)
 
         for_each_pci_dev(pdev) {
                 if (!check_device(&pdev->dev)) {
+
+                        iommu_ignore_device(&pdev->dev);
+
                         unhandled += 1;
                         continue;
                 }
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 08a90b88e40d..cee307e86606 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -482,23 +482,19 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 
         priv = domain->priv;
 
-        if (!priv) {
-                ret = -ENODEV;
+        if (!priv)
                 goto fail;
-        }
 
         fl_table = priv->pgtable;
 
         if (len != SZ_16M && len != SZ_1M &&
             len != SZ_64K && len != SZ_4K) {
                 pr_debug("Bad length: %d\n", len);
-                ret = -EINVAL;
                 goto fail;
         }
 
         if (!fl_table) {
                 pr_debug("Null page table\n");
-                ret = -EINVAL;
                 goto fail;
         }
 
@@ -507,7 +503,6 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 
         if (*fl_pte == 0) {
                 pr_debug("First level PTE is 0\n");
-                ret = -ENODEV;
                 goto fail;
         }
 
diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index 45e6878d7374..e59c166a0ce2 100644
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -164,8 +164,8 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
 
         if (drvdata->mode == LM3530_BL_MODE_ALS) {
                 if (pltfm->als_vmax == 0) {
-                        pltfm->als_vmin = als_vmin = 0;
-                        pltfm->als_vmin = als_vmax = LM3530_ALS_WINDOW_mV;
+                        pltfm->als_vmin = 0;
+                        pltfm->als_vmax = LM3530_ALS_WINDOW_mV;
                 }
 
                 als_vmin = pltfm->als_vmin;
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index c2907d836e4e..86cb7e5d83d5 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -56,7 +56,8 @@ struct raid_dev {
 struct raid_set {
         struct dm_target *ti;
 
-        uint64_t print_flags;
+        uint32_t bitmap_loaded;
+        uint32_t print_flags;
 
         struct mddev md;
         struct raid_type *raid_type;
@@ -1085,7 +1086,7 @@ static int raid_status(struct dm_target *ti, status_type_t type,
                                 raid_param_cnt += 2;
                 }
 
-                raid_param_cnt += (hweight64(rs->print_flags & ~DMPF_REBUILD) * 2);
+                raid_param_cnt += (hweight32(rs->print_flags & ~DMPF_REBUILD) * 2);
                 if (rs->print_flags & (DMPF_SYNC | DMPF_NOSYNC))
                         raid_param_cnt--;
 
@@ -1197,7 +1198,12 @@ static void raid_resume(struct dm_target *ti)
 {
         struct raid_set *rs = ti->private;
 
-        bitmap_load(&rs->md);
+        if (!rs->bitmap_loaded) {
+                bitmap_load(&rs->md);
+                rs->bitmap_loaded = 1;
+        } else
+                md_wakeup_thread(rs->md.thread);
+
         mddev_resume(&rs->md);
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9417ae2fa0bb..ce88755baf4a 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7333,7 +7333,8 @@ void md_do_sync(struct mddev *mddev)
                                         printk(KERN_INFO
                                                "md: checkpointing %s of %s.\n",
                                                desc, mdname(mddev));
-                                        mddev->recovery_cp = mddev->curr_resync;
+                                        mddev->recovery_cp =
+                                                mddev->curr_resync_completed;
                                 }
                         } else
                                 mddev->recovery_cp = MaxSector;
@@ -7351,9 +7352,9 @@ void md_do_sync(struct mddev *mddev)
                         rcu_read_unlock();
                 }
         }
+ skip:
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
 
- skip:
         if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
                 /* We completed so min/max setting can be forgotten if used. */
                 if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index dda86293dc9f..b2d8e512d3cb 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -282,6 +282,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
                 /* Default PLL configuration after power up */
                 twl6040->pll = TWL6040_SYSCLK_SEL_LPPLL;
                 twl6040->sysclk = 19200000;
+                twl6040->mclk = 32768;
         } else {
                 /* already powered-down */
                 if (!twl6040->power_count) {
@@ -305,6 +306,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
                         twl6040_power_down(twl6040);
                 }
                 twl6040->sysclk = 0;
+                twl6040->mclk = 0;
         }
 
 out:
@@ -324,23 +326,38 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
         hppllctl = twl6040_reg_read(twl6040, TWL6040_REG_HPPLLCTL);
         lppllctl = twl6040_reg_read(twl6040, TWL6040_REG_LPPLLCTL);
 
+        /* Force full reconfiguration when switching between PLL */
+        if (pll_id != twl6040->pll) {
+                twl6040->sysclk = 0;
+                twl6040->mclk = 0;
+        }
+
         switch (pll_id) {
         case TWL6040_SYSCLK_SEL_LPPLL:
                 /* low-power PLL divider */
-                switch (freq_out) {
-                case 17640000:
-                        lppllctl |= TWL6040_LPLLFIN;
-                        break;
-                case 19200000:
-                        lppllctl &= ~TWL6040_LPLLFIN;
-                        break;
-                default:
-                        dev_err(twl6040->dev,
-                                "freq_out %d not supported\n", freq_out);
-                        ret = -EINVAL;
-                        goto pll_out;
+                /* Change the sysclk configuration only if it has been canged */
+                if (twl6040->sysclk != freq_out) {
+                        switch (freq_out) {
+                        case 17640000:
+                                lppllctl |= TWL6040_LPLLFIN;
+                                break;
+                        case 19200000:
+                                lppllctl &= ~TWL6040_LPLLFIN;
+                                break;
+                        default:
+                                dev_err(twl6040->dev,
+                                        "freq_out %d not supported\n",
+                                        freq_out);
+                                ret = -EINVAL;
+                                goto pll_out;
+                        }
+                        twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL,
+                                          lppllctl);
                 }
-                twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL, lppllctl);
+
+                /* The PLL in use has not been change, we can exit */
+                if (twl6040->pll == pll_id)
+                        break;
 
                 switch (freq_in) {
                 case 32768:
@@ -371,48 +388,56 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
                         goto pll_out;
                 }
 
-                hppllctl &= ~TWL6040_MCLK_MSK;
+                if (twl6040->mclk != freq_in) {
+                        hppllctl &= ~TWL6040_MCLK_MSK;
+
+                        switch (freq_in) {
+                        case 12000000:
+                                /* PLL enabled, active mode */
+                                hppllctl |= TWL6040_MCLK_12000KHZ |
+                                            TWL6040_HPLLENA;
+                                break;
+                        case 19200000:
+                                /*
+                                * PLL disabled
+                                * (enable PLL if MCLK jitter quality
+                                *  doesn't meet specification)
+                                */
+                                hppllctl |= TWL6040_MCLK_19200KHZ;
+                                break;
+                        case 26000000:
+                                /* PLL enabled, active mode */
+                                hppllctl |= TWL6040_MCLK_26000KHZ |
+                                            TWL6040_HPLLENA;
+                                break;
+                        case 38400000:
+                                /* PLL enabled, active mode */
+                                hppllctl |= TWL6040_MCLK_38400KHZ |
+                                            TWL6040_HPLLENA;
+                                break;
+                        default:
+                                dev_err(twl6040->dev,
+                                        "freq_in %d not supported\n", freq_in);
+                                ret = -EINVAL;
+                                goto pll_out;
+                        }
 
-                switch (freq_in) {
-                case 12000000:
-                        /* PLL enabled, active mode */
-                        hppllctl |= TWL6040_MCLK_12000KHZ |
-                                    TWL6040_HPLLENA;
-                        break;
-                case 19200000:
                         /*
-                         * PLL disabled
-                         * (enable PLL if MCLK jitter quality
-                         *  doesn't meet specification)
+                         * enable clock slicer to ensure input waveform is
+                         * square
                          */
-                        hppllctl |= TWL6040_MCLK_19200KHZ;
-                        break;
-                case 26000000:
-                        /* PLL enabled, active mode */
-                        hppllctl |= TWL6040_MCLK_26000KHZ |
-                                    TWL6040_HPLLENA;
-                        break;
-                case 38400000:
-                        /* PLL enabled, active mode */
-                        hppllctl |= TWL6040_MCLK_38400KHZ |
-                                    TWL6040_HPLLENA;
-                        break;
-                default:
-                        dev_err(twl6040->dev,
-                                "freq_in %d not supported\n", freq_in);
-                        ret = -EINVAL;
-                        goto pll_out;
-                }
+                        hppllctl |= TWL6040_HPLLSQRENA;
 
-                /* enable clock slicer to ensure input waveform is square */
-                hppllctl |= TWL6040_HPLLSQRENA;
-
-                twl6040_reg_write(twl6040, TWL6040_REG_HPPLLCTL, hppllctl);
-                usleep_range(500, 700);
-                lppllctl |= TWL6040_HPLLSEL;
-                twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL, lppllctl);
-                lppllctl &= ~TWL6040_LPLLENA;
-                twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL, lppllctl);
+                        twl6040_reg_write(twl6040, TWL6040_REG_HPPLLCTL,
+                                          hppllctl);
+                        usleep_range(500, 700);
+                        lppllctl |= TWL6040_HPLLSEL;
+                        twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL,
+                                          lppllctl);
+                        lppllctl &= ~TWL6040_LPLLENA;
+                        twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL,
+                                          lppllctl);
+                }
                 break;
         default:
                 dev_err(twl6040->dev, "unknown pll id %d\n", pll_id);
@@ -421,6 +446,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
         }
 
         twl6040->sysclk = freq_out;
+        twl6040->mclk = freq_in;
         twl6040->pll = pll_id;
 
 pll_out:
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index 150cd7061b80..28adefe70f96 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -354,6 +354,7 @@ static void lkdtm_do_action(enum ctype which)
 static void lkdtm_handler(void)
 {
         unsigned long flags;
+        bool do_it = false;
 
         spin_lock_irqsave(&count_lock, flags);
         count--;
@@ -361,10 +362,13 @@ static void lkdtm_handler(void)
                         cp_name_to_str(cpoint), cp_type_to_str(cptype), count);
 
         if (count == 0) {
-                lkdtm_do_action(cptype);
+                do_it = true;
                 count = cpoint_count;
         }
         spin_unlock_irqrestore(&count_lock, flags);
+
+        if (do_it)
+                lkdtm_do_action(cptype);
 }
 
 static int lkdtm_register_cpoint(enum cname which)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 6ae9ca01388b..9a9ce71a71fc 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -119,7 +119,7 @@ static int mtd_cls_suspend(struct device *dev, pm_message_t state)
 {
         struct mtd_info *mtd = dev_get_drvdata(dev);
 
-        return mtd_suspend(mtd);
+        return mtd ? mtd_suspend(mtd) : 0;
 }
 
 static int mtd_cls_resume(struct device *dev)
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 4dd056e2e16a..35b4fb55dbd6 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -161,6 +161,37 @@ static int atmel_nand_device_ready(struct mtd_info *mtd)
                 !!host->board->rdy_pin_active_low;
 }
 
+/*
+ * Minimal-overhead PIO for data access.
+ */
+static void atmel_read_buf8(struct mtd_info *mtd, u8 *buf, int len)
+{
+        struct nand_chip        *nand_chip = mtd->priv;
+
+        __raw_readsb(nand_chip->IO_ADDR_R, buf, len);
+}
+
+static void atmel_read_buf16(struct mtd_info *mtd, u8 *buf, int len)
+{
+        struct nand_chip        *nand_chip = mtd->priv;
+
+        __raw_readsw(nand_chip->IO_ADDR_R, buf, len / 2);
+}
+
+static void atmel_write_buf8(struct mtd_info *mtd, const u8 *buf, int len)
+{
+        struct nand_chip        *nand_chip = mtd->priv;
+
+        __raw_writesb(nand_chip->IO_ADDR_W, buf, len);
+}
+
+static void atmel_write_buf16(struct mtd_info *mtd, const u8 *buf, int len)
+{
+        struct nand_chip        *nand_chip = mtd->priv;
+
+        __raw_writesw(nand_chip->IO_ADDR_W, buf, len / 2);
+}
+
 static void dma_complete_func(void *completion)
 {
         complete(completion);
@@ -235,27 +266,33 @@ err_buf:
 static void atmel_read_buf(struct mtd_info *mtd, u8 *buf, int len)
 {
         struct nand_chip *chip = mtd->priv;
+        struct atmel_nand_host *host = chip->priv;
 
         if (use_dma && len > mtd->oobsize)
                 /* only use DMA for bigger than oob size: better performances */
                 if (atmel_nand_dma_op(mtd, buf, len, 1) == 0)
                         return;
 
-        /* if no DMA operation possible, use PIO */
-        memcpy_fromio(buf, chip->IO_ADDR_R, len);
+        if (host->board->bus_width_16)
+                atmel_read_buf16(mtd, buf, len);
+        else
+                atmel_read_buf8(mtd, buf, len);
 }
 
 static void atmel_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
 {
         struct nand_chip *chip = mtd->priv;
+        struct atmel_nand_host *host = chip->priv;
 
         if (use_dma && len > mtd->oobsize)
                 /* only use DMA for bigger than oob size: better performances */
                 if (atmel_nand_dma_op(mtd, (void *)buf, len, 0) == 0)
                         return;
 
-        /* if no DMA operation possible, use PIO */
-        memcpy_toio(chip->IO_ADDR_W, buf, len);
+        if (host->board->bus_width_16)
+                atmel_write_buf16(mtd, buf, len);
+        else
+                atmel_write_buf8(mtd, buf, len);
 }
 
 /*
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index 7f680420bfab..7db6555ed3ba 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -69,17 +69,19 @@ static int clear_poll_bit(void __iomem *addr, u32 mask)
  *  [1] enable the module.
  *  [2] reset the module.
  *
- * In most of the cases, it's ok. But there is a hardware bug in the BCH block.
+ * In most of the cases, it's ok.
+ * But in MX23, there is a hardware bug in the BCH block (see erratum #2847).
  * If you try to soft reset the BCH block, it becomes unusable until
  * the next hard reset. This case occurs in the NAND boot mode. When the board
  * boots by NAND, the ROM of the chip will initialize the BCH blocks itself.
  * So If the driver tries to reset the BCH again, the BCH will not work anymore.
- * You will see a DMA timeout in this case.
+ * You will see a DMA timeout in this case. The bug has been fixed
+ * in the following chips, such as MX28.
  *
  * To avoid this bug, just add a new parameter `just_enable` for
  * the mxs_reset_block(), and rewrite it here.
  */
-int gpmi_reset_block(void __iomem *reset_addr, bool just_enable)
+static int gpmi_reset_block(void __iomem *reset_addr, bool just_enable)
 {
         int ret;
         int timeout = 0x400;
@@ -206,7 +208,15 @@ int bch_set_geometry(struct gpmi_nand_data *this)
         if (ret)
                 goto err_out;
 
-        ret = gpmi_reset_block(r->bch_regs, true);
+        /*
+        * Due to erratum #2847 of the MX23, the BCH cannot be soft reset on this
+        * chip, otherwise it will lock up. So we skip resetting BCH on the MX23.
+        * On the other hand, the MX28 needs the reset, because one case has been
+        * seen where the BCH produced ECC errors constantly after 10000
+        * consecutive reboots. The latter case has not been seen on the MX23 yet,
+        * still we don't know if it could happen there as well.
+        */
+        ret = gpmi_reset_block(r->bch_regs, GPMI_IS_MX23(this));
         if (ret)
                 goto err_out;
 
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 35b4565050f1..8a393f9e6027 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2588,7 +2588,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
         instr->state = MTD_ERASING;
 
         while (len) {
-                /* Heck if we have a bad block, we do not erase bad blocks! */
+                /* Check if we have a bad block, we do not erase bad blocks! */
                 if (nand_block_checkbad(mtd, ((loff_t) page) <<
                                         chip->page_shift, 0, allowbbt)) {
                         pr_warn("%s: attempt to erase a bad block at page 0x%08x\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 752493f00406..65d1f05007be 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -972,11 +972,11 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         }
 #endif
 
-        spin_unlock_irqrestore(&trans->shrd->lock, flags);
-
         /* saved interrupt in inta variable now we can reset trans_pcie->inta */
         trans_pcie->inta = 0;
 
+        spin_unlock_irqrestore(&trans->shrd->lock, flags);
+
         /* Now service all interrupt bits discovered above. */
         if (inta & CSR_INT_BIT_HW_ERR) {
                 IWL_ERR(trans, "Hardware error detected.  Restarting.\n");
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index fa679057630f..698b905058dd 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -68,7 +68,7 @@ struct netfront_cb {
 
 #define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
 #define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
-#define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256)
+#define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE, 256)
 
 struct netfront_stats {
         u64                     rx_packets;
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 749c2a16012c..1932029de48d 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1269,10 +1269,8 @@ static int pcmcia_bus_add(struct pcmcia_socket *skt)
 
 static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)
 {
-        if (!verify_cis_cache(skt)) {
-                pcmcia_put_socket(skt);
+        if (!verify_cis_cache(skt))
                 return 0;
-        }
 
         dev_dbg(&skt->dev, "cis mismatch - different card\n");
 
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 569bdb3ef104..8fe15cf15ac8 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -510,10 +510,12 @@ static struct dentry *debugfs_root;
 
 static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
 {
-        static struct dentry *device_root;
+        struct dentry *device_root;
 
         device_root = debugfs_create_dir(dev_name(pctldev->dev),
                                          debugfs_root);
+        pctldev->device_root = device_root;
+
         if (IS_ERR(device_root) || !device_root) {
                 pr_warn("failed to create debugfs directory for %s\n",
                         dev_name(pctldev->dev));
@@ -529,6 +531,11 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
         pinconf_init_device_debugfs(device_root, pctldev);
 }
 
+static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
+{
+        debugfs_remove_recursive(pctldev->device_root);
+}
+
 static void pinctrl_init_debugfs(void)
 {
         debugfs_root = debugfs_create_dir("pinctrl", NULL);
@@ -553,6 +560,10 @@ static void pinctrl_init_debugfs(void)
 {
 }
 
+static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
+{
+}
+
 #endif
 
 /**
@@ -572,40 +583,40 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
         if (pctldesc->name == NULL)
                 return NULL;
 
+        pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);
+        if (pctldev == NULL)
+                return NULL;
+
+        /* Initialize pin control device struct */
+        pctldev->owner = pctldesc->owner;
+        pctldev->desc = pctldesc;
+        pctldev->driver_data = driver_data;
+        INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);
+        spin_lock_init(&pctldev->pin_desc_tree_lock);
+        INIT_LIST_HEAD(&pctldev->gpio_ranges);
+        mutex_init(&pctldev->gpio_ranges_lock);
+        pctldev->dev = dev;
+
         /* If we're implementing pinmuxing, check the ops for sanity */
         if (pctldesc->pmxops) {
-                ret = pinmux_check_ops(pctldesc->pmxops);
+                ret = pinmux_check_ops(pctldev);
                 if (ret) {
                         pr_err("%s pinmux ops lacks necessary functions\n",
                                pctldesc->name);
-                        return NULL;
+                        goto out_err;
                 }
         }
 
         /* If we're implementing pinconfig, check the ops for sanity */
         if (pctldesc->confops) {
-                ret = pinconf_check_ops(pctldesc->confops);
+                ret = pinconf_check_ops(pctldev);
                 if (ret) {
                         pr_err("%s pin config ops lacks necessary functions\n",
                                pctldesc->name);
-                        return NULL;
+                        goto out_err;
                 }
         }
 
-        pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);
-        if (pctldev == NULL)
-                return NULL;
-
-        /* Initialize pin control device struct */
-        pctldev->owner = pctldesc->owner;
-        pctldev->desc = pctldesc;
-        pctldev->driver_data = driver_data;
-        INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);
-        spin_lock_init(&pctldev->pin_desc_tree_lock);
-        INIT_LIST_HEAD(&pctldev->gpio_ranges);
-        mutex_init(&pctldev->gpio_ranges_lock);
-        pctldev->dev = dev;
-
         /* Register all the pins */
         pr_debug("try to register %d pins on %s...\n",
                  pctldesc->npins, pctldesc->name);
@@ -641,6 +652,7 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)
         if (pctldev == NULL)
                 return;
 
+        pinctrl_remove_device_debugfs(pctldev);
         pinmux_unhog_maps(pctldev);
         /* TODO: check that no pinmuxes are still active? */
         mutex_lock(&pinctrldev_list_mutex);
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index 177a3310547f..cfa86da6b4b1 100644
--- a/drivers/pinctrl/core.h
+++ b/drivers/pinctrl/core.h
@@ -41,6 +41,9 @@ struct pinctrl_dev {
         struct device *dev;
         struct module *owner;
         void *driver_data;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *device_root;
+#endif
 #ifdef CONFIG_PINMUX
         struct mutex pinmux_hogs_lock;
         struct list_head pinmux_hogs;
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 1259872b0a1d..9fb75456824c 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -205,8 +205,10 @@ int pin_config_group_set(const char *dev_name, const char *pin_group,
 }
 EXPORT_SYMBOL(pin_config_group_set);
 
-int pinconf_check_ops(const struct pinconf_ops *ops)
+int pinconf_check_ops(struct pinctrl_dev *pctldev)
 {
+        const struct pinconf_ops *ops = pctldev->desc->confops;
+
         /* We must be able to read out pin status */
         if (!ops->pin_config_get && !ops->pin_config_group_get)
                 return -EINVAL;
@@ -236,7 +238,7 @@ static int pinconf_pins_show(struct seq_file *s, void *what)
         seq_puts(s, "Format: pin (name): pinmux setting array\n");
 
         /* The pin number can be retrived from the pin controller descriptor */
-        for (i = 0; pin < pctldev->desc->npins; i++) {
+        for (i = 0; i < pctldev->desc->npins; i++) {
                 struct pin_desc *desc;
 
                 pin = pctldev->desc->pins[i].number;
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index e7dc6165032a..006b77fa737e 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_PINCONF
 
-int pinconf_check_ops(const struct pinconf_ops *ops);
+int pinconf_check_ops(struct pinctrl_dev *pctldev);
 void pinconf_init_device_debugfs(struct dentry *devroot,
                                  struct pinctrl_dev *pctldev);
 int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
@@ -23,7 +23,7 @@ int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
 
 #else
 
-static inline int pinconf_check_ops(const struct pinconf_ops *ops)
+static inline int pinconf_check_ops(struct pinctrl_dev *pctldev)
 {
         return 0;
 }
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index a76a348321bb..7c3193f7a044 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -53,11 +53,6 @@ struct pinmux_group {
  * @dev: the device using this pinmux
  * @usecount: the number of active users of this mux setting, used to keep
  *      track of nested use cases
- * @pins: an array of discrete physical pins used in this mapping, taken
- *      from the global pin enumeration space (copied from pinmux map)
- * @num_pins: the number of pins in this mapping array, i.e. the number of
- *      elements in .pins so we can iterate over that array (copied from
- *      pinmux map)
  * @pctldev: pin control device handling this pinmux
  * @func_selector: the function selector for the pinmux device handling
  *      this pinmux
@@ -152,8 +147,7 @@ static int pin_request(struct pinctrl_dev *pctldev,
                 status = 0;
 
         if (status)
-                dev_err(pctldev->dev, "->request on device %s failed "
-                       "for pin %d\n",
+                dev_err(pctldev->dev, "->request on device %s failed for pin %d\n",
                        pctldev->desc->name, pin);
 out_free_pin:
         if (status) {
@@ -355,21 +349,20 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps,
         /* First sanity check the new mapping */
         for (i = 0; i < num_maps; i++) {
                 if (!maps[i].name) {
-                        pr_err("failed to register map %d: "
-                               "no map name given\n", i);
+                        pr_err("failed to register map %d: no map name given\n",
+                                        i);
                         return -EINVAL;
                 }
 
                 if (!maps[i].ctrl_dev && !maps[i].ctrl_dev_name) {
-                        pr_err("failed to register map %s (%d): "
-                               "no pin control device given\n",
+                        pr_err("failed to register map %s (%d): no pin control device given\n",
                                maps[i].name, i);
                         return -EINVAL;
                 }
 
                 if (!maps[i].function) {
-                        pr_err("failed to register map %s (%d): "
-                               "no function ID given\n", maps[i].name, i);
+                        pr_err("failed to register map %s (%d): no function ID given\n",
+                                        maps[i].name, i);
                         return -EINVAL;
                 }
 
@@ -411,7 +404,7 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps,
 }
 
 /**
- * acquire_pins() - acquire all the pins for a certain funcion on a pinmux
+ * acquire_pins() - acquire all the pins for a certain function on a pinmux
  * @pctldev: the device to take the pins on
  * @func_selector: the function selector to acquire the pins for
  * @group_selector: the group selector containing the pins to acquire
@@ -442,8 +435,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,
                 ret = pin_request(pctldev, pins[i], func, NULL);
                 if (ret) {
                         dev_err(pctldev->dev,
-                                "could not get pin %d for function %s "
-                                "on device %s - conflicting mux mappings?\n",
+                                "could not get pin %d for function %s on device %s - conflicting mux mappings?\n",
                                 pins[i], func ? : "(undefined)",
                                 pinctrl_dev_get_name(pctldev));
                         /* On error release all taken pins */
@@ -458,7 +450,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,
 
 /**
  * release_pins() - release pins taken by earlier acquirement
- * @pctldev: the device to free the pinx on
+ * @pctldev: the device to free the pins on
  * @group_selector: the group selector containing the pins to free
  */
 static void release_pins(struct pinctrl_dev *pctldev,
@@ -473,8 +465,7 @@ static void release_pins(struct pinctrl_dev *pctldev,
         ret = pctlops->get_group_pins(pctldev, group_selector,
                                       &pins, &num_pins);
         if (ret) {
-                dev_err(pctldev->dev, "could not get pins to release for "
-                        "group selector %d\n",
+                dev_err(pctldev->dev, "could not get pins to release for group selector %d\n",
                         group_selector);
                 return;
         }
@@ -526,8 +517,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,
                 ret = pinctrl_get_group_selector(pctldev, groups[0]);
                 if (ret < 0) {
                         dev_err(pctldev->dev,
-                                "function %s wants group %s but the pin "
-                                "controller does not seem to have that group\n",
+                                "function %s wants group %s but the pin controller does not seem to have that group\n",
                                 pmxops->get_function_name(pctldev, func_selector),
                                 groups[0]);
                         return ret;
@@ -535,8 +525,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,
 
                 if (num_groups > 1)
                         dev_dbg(pctldev->dev,
-                                "function %s support more than one group, "
-                                "default-selecting first group %s (%d)\n",
+                                "function %s support more than one group, default-selecting first group %s (%d)\n",
                                 pmxops->get_function_name(pctldev, func_selector),
                                 groups[0],
                                 ret);
@@ -628,10 +617,8 @@ static int pinmux_enable_muxmap(struct pinctrl_dev *pctldev,
 
         if (pmx->pctldev && pmx->pctldev != pctldev) {
                 dev_err(pctldev->dev,
-                        "different pin control devices given for device %s, "
-                        "function %s\n",
-                        devname,
-                        map->function);
+                        "different pin control devices given for device %s, function %s\n",
+                        devname, map->function);
                 return -EINVAL;
         }
         pmx->dev = dev;
@@ -695,7 +682,6 @@ static void pinmux_free_groups(struct pinmux *pmx)
  */
 struct pinmux *pinmux_get(struct device *dev, const char *name)
 {
-
         struct pinmux_map const *map = NULL;
         struct pinctrl_dev *pctldev = NULL;
         const char *devname = NULL;
@@ -745,8 +731,7 @@ struct pinmux *pinmux_get(struct device *dev, const char *name)
                         else if (map->ctrl_dev_name)
                                 devname = map->ctrl_dev_name;
 
-                        pr_warning("could not find a pinctrl device for pinmux "
-                                   "function %s, fishy, they shall all have one\n",
+                        pr_warning("could not find a pinctrl device for pinmux function %s, fishy, they shall all have one\n",
                                    map->function);
                         pr_warning("given pinctrl device name: %s",
                                    devname ? devname : "UNDEFINED");
@@ -904,8 +889,11 @@ void pinmux_disable(struct pinmux *pmx)
 }
 EXPORT_SYMBOL_GPL(pinmux_disable);
 
-int pinmux_check_ops(const struct pinmux_ops *ops)
+int pinmux_check_ops(struct pinctrl_dev *pctldev)
 {
+        const struct pinmux_ops *ops = pctldev->desc->pmxops;
+        unsigned selector = 0;
+
         /* Check that we implement required operations */
         if (!ops->list_functions ||
             !ops->get_function_name ||
@@ -914,6 +902,18 @@ int pinmux_check_ops(const struct pinmux_ops *ops)
             !ops->disable)
                 return -EINVAL;
 
+        /* Check that all functions registered have names */
+        while (ops->list_functions(pctldev, selector) >= 0) {
+                const char *fname = ops->get_function_name(pctldev,
+                                                           selector);
+                if (!fname) {
+                        pr_err("pinmux ops has no name for function%u\n",
+                                selector);
+                        return -EINVAL;
+                }
+                selector++;
+        }
+
         return 0;
 }
 
@@ -932,8 +932,8 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev,
                  * without any problems, so then we can hog pinmuxes for
                  * all devices that just want a static pin mux at this point.
                  */
-                dev_err(pctldev->dev, "map %s wants to hog a non-system "
-                        "pinmux, this is not going to work\n", map->name);
+                dev_err(pctldev->dev, "map %s wants to hog a non-system pinmux, this is not going to work\n",
+                                map->name);
                 return -EINVAL;
         }
 
@@ -993,9 +993,12 @@ int pinmux_hog_maps(struct pinctrl_dev *pctldev)
         for (i = 0; i < pinmux_maps_num; i++) {
                 struct pinmux_map const *map = &pinmux_maps[i];
 
-                if (((map->ctrl_dev == dev) ||
-                     !strcmp(map->ctrl_dev_name, devname)) &&
-                    map->hog_on_boot) {
+                if (!map->hog_on_boot)
+                        continue;
+
+                if ((map->ctrl_dev == dev) ||
+                        (map->ctrl_dev_name &&
+                                !strcmp(map->ctrl_dev_name, devname))) {
                         /* OK time to hog! */
                         ret = pinmux_hog_map(pctldev, map);
                         if (ret)
@@ -1122,13 +1125,15 @@ static int pinmux_show(struct seq_file *s, void *what)
 
                 seq_printf(s, "device: %s function: %s (%u),",
                            pinctrl_dev_get_name(pmx->pctldev),
-                           pmxops->get_function_name(pctldev, pmx->func_selector),
+                           pmxops->get_function_name(pctldev,
+                                   pmx->func_selector),
                            pmx->func_selector);
 
                 seq_printf(s, " groups: [");
                 list_for_each_entry(grp, &pmx->groups, node) {
                         seq_printf(s, " %s (%u)",
-                                   pctlops->get_group_name(pctldev, grp->group_selector),
+                                   pctlops->get_group_name(pctldev,
+                                           grp->group_selector),
                                    grp->group_selector);
                 }
                 seq_printf(s, " ]");
diff --git a/drivers/pinctrl/pinmux.h b/drivers/pinctrl/pinmux.h
index 844500b3331b..97f52223fbc2 100644
--- a/drivers/pinctrl/pinmux.h
+++ b/drivers/pinctrl/pinmux.h
@@ -12,7 +12,7 @@
  */
 #ifdef CONFIG_PINMUX
 
-int pinmux_check_ops(const struct pinmux_ops *ops);
+int pinmux_check_ops(struct pinctrl_dev *pctldev);
 void pinmux_init_device_debugfs(struct dentry *devroot,
                                 struct pinctrl_dev *pctldev);
 void pinmux_init_debugfs(struct dentry *subsys_root);
@@ -21,7 +21,7 @@ void pinmux_unhog_maps(struct pinctrl_dev *pctldev);
 
 #else
 
-static inline int pinmux_check_ops(const struct pinmux_ops *ops)
+static inline int pinmux_check_ops(struct pinctrl_dev *pctldev)
 {
         return 0;
 }
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index f1651eb69648..679734d26a16 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -35,7 +35,7 @@ static void of_get_regulation_constraints(struct device_node *np,
         if (constraints->min_uV != constraints->max_uV)
                 constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;
         /* Only one voltage?  Then make sure it's set. */
-        if (constraints->min_uV == constraints->max_uV)
+        if (min_uV && max_uV && constraints->min_uV == constraints->max_uV)
                 constraints->apply_uV = true;
 
         uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index eef27a197c00..110137e7ec81 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3261,6 +3261,12 @@ void dasd_generic_path_event(struct ccw_device *cdev, int *path_event)
                         device->path_data.tbvpm |= eventlpm;
                         dasd_schedule_device_bh(device);
                 }
+                if (path_event[chp] & PE_PATHGROUP_ESTABLISHED) {
+                        DBF_DEV_EVENT(DBF_WARNING, device, "%s",
+                                      "Pathgroup re-established\n");
+                        if (device->discipline->kick_validate)
+                                device->discipline->kick_validate(device);
+                }
         }
         dasd_put_device(device);
 }
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 553b3c5abb0a..b3beed5434e4 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -189,14 +189,12 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
         unsigned long flags;
         struct alias_server *server, *newserver;
         struct alias_lcu *lcu, *newlcu;
-        int is_lcu_known;
         struct dasd_uid uid;
 
         private = (struct dasd_eckd_private *) device->private;
 
         device->discipline->get_uid(device, &uid);
         spin_lock_irqsave(&aliastree.lock, flags);
-        is_lcu_known = 1;
         server = _find_server(&uid);
         if (!server) {
                 spin_unlock_irqrestore(&aliastree.lock, flags);
@@ -208,7 +206,6 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
                 if (!server) {
                         list_add(&newserver->server, &aliastree.serverlist);
                         server = newserver;
-                        is_lcu_known = 0;
                 } else {
                         /* someone was faster */
                         _free_server(newserver);
@@ -226,12 +223,10 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
                 if (!lcu) {
                         list_add(&newlcu->lcu, &server->lculist);
                         lcu = newlcu;
-                        is_lcu_known = 0;
                 } else {
                         /* someone was faster */
                         _free_lcu(newlcu);
                 }
-                is_lcu_known = 0;
         }
         spin_lock(&lcu->lock);
         list_add(&device->alias_list, &lcu->inactive_devices);
@@ -239,64 +234,7 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
         spin_unlock(&lcu->lock);
         spin_unlock_irqrestore(&aliastree.lock, flags);
 
-        return is_lcu_known;
-}
-
-/*
- * The first device to be registered on an LCU will have to do
- * some additional setup steps to configure that LCU on the
- * storage server. All further devices should wait with their
- * initialization until the first device is done.
- * To synchronize this work, the first device will call
- * dasd_alias_lcu_setup_complete when it is done, and all
- * other devices will wait for it with dasd_alias_wait_for_lcu_setup.
- */
-void dasd_alias_lcu_setup_complete(struct dasd_device *device)
-{
-        unsigned long flags;
-        struct alias_server *server;
-        struct alias_lcu *lcu;
-        struct dasd_uid uid;
-
-        device->discipline->get_uid(device, &uid);
-        lcu = NULL;
-        spin_lock_irqsave(&aliastree.lock, flags);
-        server = _find_server(&uid);
-        if (server)
-                lcu = _find_lcu(server, &uid);
-        spin_unlock_irqrestore(&aliastree.lock, flags);
-        if (!lcu) {
-                DBF_EVENT_DEVID(DBF_ERR, device->cdev,
-                                "could not find lcu for %04x %02x",
-                                uid.ssid, uid.real_unit_addr);
-                WARN_ON(1);
-                return;
-        }
-        complete_all(&lcu->lcu_setup);
-}
-
-void dasd_alias_wait_for_lcu_setup(struct dasd_device *device)
-{
-        unsigned long flags;
-        struct alias_server *server;
-        struct alias_lcu *lcu;
-        struct dasd_uid uid;
-
-        device->discipline->get_uid(device, &uid);
-        lcu = NULL;
-        spin_lock_irqsave(&aliastree.lock, flags);
-        server = _find_server(&uid);
-        if (server)
-                lcu = _find_lcu(server, &uid);
-        spin_unlock_irqrestore(&aliastree.lock, flags);
-        if (!lcu) {
-                DBF_EVENT_DEVID(DBF_ERR, device->cdev,
-                                "could not find lcu for %04x %02x",
-                                uid.ssid, uid.real_unit_addr);
-                WARN_ON(1);
-                return;
-        }
-        wait_for_completion(&lcu->lcu_setup);
+        return 0;
 }
 
 /*
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index bbcd5e9206ee..70880be26015 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1534,6 +1534,10 @@ static void dasd_eckd_validate_server(struct dasd_device *device)
         struct dasd_eckd_private *private;
         int enable_pav;
 
+        private = (struct dasd_eckd_private *) device->private;
+        if (private->uid.type == UA_BASE_PAV_ALIAS ||
+            private->uid.type == UA_HYPER_PAV_ALIAS)
+                return;
         if (dasd_nopav || MACHINE_IS_VM)
                 enable_pav = 0;
         else
@@ -1542,11 +1546,28 @@ static void dasd_eckd_validate_server(struct dasd_device *device)
 
         /* may be requested feature is not available on server,
          * therefore just report error and go ahead */
-        private = (struct dasd_eckd_private *) device->private;
         DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "PSF-SSC for SSID %04x "
                         "returned rc=%d", private->uid.ssid, rc);
 }
 
+/*
+ * worker to do a validate server in case of a lost pathgroup
+ */
+static void dasd_eckd_do_validate_server(struct work_struct *work)
+{
+        struct dasd_device *device = container_of(work, struct dasd_device,
+                                                  kick_validate);
+        dasd_eckd_validate_server(device);
+        dasd_put_device(device);
+}
+
+static void dasd_eckd_kick_validate_server(struct dasd_device *device)
+{
+        dasd_get_device(device);
+        /* queue call to do_validate_server to the kernel event daemon. */
+        schedule_work(&device->kick_validate);
+}
+
 static u32 get_fcx_max_data(struct dasd_device *device)
 {
 #if defined(CONFIG_64BIT)
@@ -1588,10 +1609,13 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
         struct dasd_eckd_private *private;
         struct dasd_block *block;
         struct dasd_uid temp_uid;
-        int is_known, rc, i;
+        int rc, i;
         int readonly;
         unsigned long value;
 
+        /* setup work queue for validate server*/
+        INIT_WORK(&device->kick_validate, dasd_eckd_do_validate_server);
+
         if (!ccw_device_is_pathgroup(device->cdev)) {
                 dev_warn(&device->cdev->dev,
                          "A channel path group could not be established\n");
@@ -1651,22 +1675,12 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                 block->base = device;
         }
 
-        /* register lcu with alias handling, enable PAV if this is a new lcu */
-        is_known = dasd_alias_make_device_known_to_lcu(device);
-        if (is_known < 0) {
-                rc = is_known;
+        /* register lcu with alias handling, enable PAV */
+        rc = dasd_alias_make_device_known_to_lcu(device);
+        if (rc)
                 goto out_err2;
-        }
-        /*
-         * dasd_eckd_validate_server is done on the first device that
-         * is found for an LCU. All later other devices have to wait
-         * for it, so they will read the correct feature codes.
-         */
-        if (!is_known) {
-                dasd_eckd_validate_server(device);
-                dasd_alias_lcu_setup_complete(device);
-        } else
-                dasd_alias_wait_for_lcu_setup(device);
+
+        dasd_eckd_validate_server(device);
 
         /* device may report different configuration data after LCU setup */
         rc = dasd_eckd_read_conf(device);
@@ -4098,7 +4112,7 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
 {
         struct dasd_eckd_private *private;
         struct dasd_eckd_characteristics temp_rdc_data;
-        int is_known, rc;
+        int rc;
         struct dasd_uid temp_uid;
         unsigned long flags;
 
@@ -4121,14 +4135,10 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
                 goto out_err;
 
         /* register lcu with alias handling, enable PAV if this is a new lcu */
-        is_known = dasd_alias_make_device_known_to_lcu(device);
-        if (is_known < 0)
-                return is_known;
-        if (!is_known) {
-                dasd_eckd_validate_server(device);
-                dasd_alias_lcu_setup_complete(device);
-        } else
-                dasd_alias_wait_for_lcu_setup(device);
+        rc = dasd_alias_make_device_known_to_lcu(device);
+        if (rc)
+                return rc;
+        dasd_eckd_validate_server(device);
 
         /* RE-Read Configuration Data */
         rc = dasd_eckd_read_conf(device);
@@ -4270,6 +4280,7 @@ static struct dasd_discipline dasd_eckd_discipline = {
         .restore = dasd_eckd_restore_device,
         .reload = dasd_eckd_reload_device,
         .get_uid = dasd_eckd_get_uid,
+        .kick_validate = dasd_eckd_kick_validate_server,
 };
 
 static int __init
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index afe8c33422ed..33a6743ddc55 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -355,6 +355,7 @@ struct dasd_discipline {
         int (*reload) (struct dasd_device *);
 
         int (*get_uid) (struct dasd_device *, struct dasd_uid *);
+        void (*kick_validate) (struct dasd_device *);
 };
 
 extern struct dasd_discipline *dasd_diag_discipline_pointer;
@@ -455,6 +456,7 @@ struct dasd_device {
         struct work_struct kick_work;
         struct work_struct restore_device;
         struct work_struct reload_device;
+        struct work_struct kick_validate;
         struct timer_list timer;
 
         debug_info_t *debug_area;
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 3f9a47ec67dc..8293658e7cf9 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -299,7 +299,7 @@ config SPI_S3C24XX_FIQ
 
 config SPI_S3C64XX
         tristate "Samsung S3C64XX series type SPI"
-        depends on (ARCH_S3C64XX || ARCH_S5P64X0)
+        depends on (ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS)
         select S3C64XX_DMA if ARCH_S3C64XX
         help
           SPI driver for Samsung S3C64XX and newer SoCs.
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 2a6429d8c363..10182eb50068 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1720,7 +1720,7 @@ static int pch_spi_resume(struct pci_dev *pdev)
 
 #endif
 
-static struct pci_driver pch_spi_pcidev = {
+static struct pci_driver pch_spi_pcidev_driver = {
         .name = "pch_spi",
         .id_table = pch_spi_pcidev_id,
         .probe = pch_spi_probe,
@@ -1736,7 +1736,7 @@ static int __init pch_spi_init(void)
         if (ret)
                 return ret;
 
-        ret = pci_register_driver(&pch_spi_pcidev);
+        ret = pci_register_driver(&pch_spi_pcidev_driver);
         if (ret)
                 return ret;
 
@@ -1746,7 +1746,7 @@ module_init(pch_spi_init);
 
 static void __exit pch_spi_exit(void)
 {
-        pci_unregister_driver(&pch_spi_pcidev);
+        pci_unregister_driver(&pch_spi_pcidev_driver);
         platform_driver_unregister(&pch_spi_pd_driver);
 }
 module_exit(pch_spi_exit);
diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
index 70e006b50f29..5443e25086e9 100644
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@ -1279,3 +1279,4 @@ static struct usb_driver go7007_usb_driver = {
 };
 
 module_usb_driver(go7007_usb_driver);
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index ac44af165b27..44262908def5 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1061,7 +1061,7 @@ attach_cmd:
         if (ret < 0)
                 return iscsit_add_reject_from_cmd(
                                 ISCSI_REASON_BOOKMARK_NO_RESOURCES,
-                                1, 1, buf, cmd);
+                                1, 0, buf, cmd);
         /*
          * Check the CmdSN against ExpCmdSN/MaxCmdSN here if
          * the Immediate Bit is not set, and no Immediate
@@ -3164,6 +3164,30 @@ static int iscsit_send_task_mgt_rsp(
         return 0;
 }
 
+static bool iscsit_check_inaddr_any(struct iscsi_np *np)
+{
+        bool ret = false;
+
+        if (np->np_sockaddr.ss_family == AF_INET6) {
+                const struct sockaddr_in6 sin6 = {
+                        .sin6_addr = IN6ADDR_ANY_INIT };
+                struct sockaddr_in6 *sock_in6 =
+                         (struct sockaddr_in6 *)&np->np_sockaddr;
+
+                if (!memcmp(sock_in6->sin6_addr.s6_addr,
+                                sin6.sin6_addr.s6_addr, 16))
+                        ret = true;
+        } else {
+                struct sockaddr_in * sock_in =
+                        (struct sockaddr_in *)&np->np_sockaddr;
+
+                if (sock_in->sin_addr.s_addr == INADDR_ANY)
+                        ret = true;
+        }
+
+        return ret;
+}
+
 static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd)
 {
         char *payload = NULL;
@@ -3213,12 +3237,17 @@ static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd)
                         spin_lock(&tpg->tpg_np_lock);
                         list_for_each_entry(tpg_np, &tpg->tpg_gnp_list,
                                                 tpg_np_list) {
+                                struct iscsi_np *np = tpg_np->tpg_np;
+                                bool inaddr_any = iscsit_check_inaddr_any(np);
+
                                 len = sprintf(buf, "TargetAddress="
                                         "%s%s%s:%hu,%hu",
-                                        (tpg_np->tpg_np->np_sockaddr.ss_family == AF_INET6) ?
-                                        "[" : "", tpg_np->tpg_np->np_ip,
-                                        (tpg_np->tpg_np->np_sockaddr.ss_family == AF_INET6) ?
-                                        "]" : "", tpg_np->tpg_np->np_port,
+                                        (np->np_sockaddr.ss_family == AF_INET6) ?
+                                        "[" : "", (inaddr_any == false) ?
+                                                np->np_ip : conn->local_ip,
+                                        (np->np_sockaddr.ss_family == AF_INET6) ?
+                                        "]" : "", (inaddr_any == false) ?
+                                                np->np_port : conn->local_port,
                                         tpg->tpgt);
                                 len += 1;
 
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 3468caab47a2..6b35b37988ed 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -21,6 +21,7 @@
 
 #include <linux/configfs.h>
 #include <linux/export.h>
+#include <linux/inet.h>
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
 #include <target/target_core_fabric_configfs.h>
diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h
index f1a02dad05a0..0ec3b77a0c27 100644
--- a/drivers/target/iscsi/iscsi_target_core.h
+++ b/drivers/target/iscsi/iscsi_target_core.h
@@ -508,6 +508,7 @@ struct iscsi_conn {
         u16                     cid;
         /* Remote TCP Port */
         u16                     login_port;
+        u16                     local_port;
         int                     net_size;
         u32                     auth_id;
 #define CONNFLAG_SCTP_STRUCT_FILE                       0x01
@@ -527,6 +528,7 @@ struct iscsi_conn {
         unsigned char           bad_hdr[ISCSI_HDR_LEN];
 #define IPV6_ADDRESS_SPACE                              48
         unsigned char           login_ip[IPV6_ADDRESS_SPACE];
+        unsigned char           local_ip[IPV6_ADDRESS_SPACE];
         int                     conn_usage_count;
         int                     conn_waiting_on_uc;
         atomic_t                check_immediate_queue;
@@ -561,8 +563,8 @@ struct iscsi_conn {
         struct hash_desc        conn_tx_hash;
         /* Used for scheduling TX and RX connection kthreads */
         cpumask_var_t           conn_cpumask;
-        int                     conn_rx_reset_cpumask:1;
-        int                     conn_tx_reset_cpumask:1;
+        unsigned int            conn_rx_reset_cpumask:1;
+        unsigned int            conn_tx_reset_cpumask:1;
         /* list_head of struct iscsi_cmd for this connection */
         struct list_head        conn_cmd_list;
         struct list_head        immed_queue_list;
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 255c0d67e898..27901e37c125 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -1238,7 +1238,7 @@ void iscsit_mod_dataout_timer(struct iscsi_cmd *cmd)
 {
         struct iscsi_conn *conn = cmd->conn;
         struct iscsi_session *sess = conn->sess;
-        struct iscsi_node_attrib *na = na = iscsit_tpg_get_node_attrib(sess);
+        struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
 
         spin_lock_bh(&cmd->dataout_timeout_lock);
         if (!(cmd->dataout_timer_flags & ISCSI_TF_RUNNING)) {
@@ -1261,7 +1261,7 @@ void iscsit_start_dataout_timer(
         struct iscsi_conn *conn)
 {
         struct iscsi_session *sess = conn->sess;
-        struct iscsi_node_attrib *na = na = iscsit_tpg_get_node_attrib(sess);
+        struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
 
         if (cmd->dataout_timer_flags & ISCSI_TF_RUNNING)
                 return;
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 373b0cc6abd8..38cb7ce8469e 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -615,8 +615,8 @@ static int iscsi_post_login_handler(
                 }
 
                 pr_debug("iSCSI Login successful on CID: %hu from %s to"
-                        " %s:%hu,%hu\n", conn->cid, conn->login_ip, np->np_ip,
-                                np->np_port, tpg->tpgt);
+                        " %s:%hu,%hu\n", conn->cid, conn->login_ip,
+                        conn->local_ip, conn->local_port, tpg->tpgt);
 
                 list_add_tail(&conn->conn_list, &sess->sess_conn_list);
                 atomic_inc(&sess->nconn);
@@ -658,7 +658,8 @@ static int iscsi_post_login_handler(
         sess->session_state = TARG_SESS_STATE_LOGGED_IN;
 
         pr_debug("iSCSI Login successful on CID: %hu from %s to %s:%hu,%hu\n",
-                conn->cid, conn->login_ip, np->np_ip, np->np_port, tpg->tpgt);
+                conn->cid, conn->login_ip, conn->local_ip, conn->local_port,
+                tpg->tpgt);
 
         spin_lock_bh(&sess->conn_lock);
         list_add_tail(&conn->conn_list, &sess->sess_conn_list);
@@ -841,6 +842,14 @@ int iscsi_target_setup_login_socket(
                 goto fail;
         }
 
+        ret = kernel_setsockopt(sock, IPPROTO_IP, IP_FREEBIND,
+                        (char *)&opt, sizeof(opt));
+        if (ret < 0) {
+                pr_err("kernel_setsockopt() for IP_FREEBIND"
+                        " failed\n");
+                goto fail;
+        }
+
         ret = kernel_bind(sock, (struct sockaddr *)&np->np_sockaddr, len);
         if (ret < 0) {
                 pr_err("kernel_bind() failed: %d\n", ret);
@@ -1020,6 +1029,18 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
                 snprintf(conn->login_ip, sizeof(conn->login_ip), "%pI6c",
                                 &sock_in6.sin6_addr.in6_u);
                 conn->login_port = ntohs(sock_in6.sin6_port);
+
+                if (conn->sock->ops->getname(conn->sock,
+                                (struct sockaddr *)&sock_in6, &err, 0) < 0) {
+                        pr_err("sock_ops->getname() failed.\n");
+                        iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
+                                        ISCSI_LOGIN_STATUS_TARGET_ERROR);
+                        goto new_sess_out;
+                }
+                snprintf(conn->local_ip, sizeof(conn->local_ip), "%pI6c",
+                                &sock_in6.sin6_addr.in6_u);
+                conn->local_port = ntohs(sock_in6.sin6_port);
+
         } else {
                 memset(&sock_in, 0, sizeof(struct sockaddr_in));
 
@@ -1032,6 +1053,16 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
                 }
                 sprintf(conn->login_ip, "%pI4", &sock_in.sin_addr.s_addr);
                 conn->login_port = ntohs(sock_in.sin_port);
+
+                if (conn->sock->ops->getname(conn->sock,
+                                (struct sockaddr *)&sock_in, &err, 0) < 0) {
+                        pr_err("sock_ops->getname() failed.\n");
+                        iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
+                                        ISCSI_LOGIN_STATUS_TARGET_ERROR);
+                        goto new_sess_out;
+                }
+                sprintf(conn->local_ip, "%pI4", &sock_in.sin_addr.s_addr);
+                conn->local_port = ntohs(sock_in.sin_port);
         }
 
         conn->network_transport = np->np_network_transport;
@@ -1039,7 +1070,7 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
         pr_debug("Received iSCSI login request from %s on %s Network"
                         " Portal %s:%hu\n", conn->login_ip,
                 (conn->network_transport == ISCSI_TCP) ? "TCP" : "SCTP",
-                        np->np_ip, np->np_port);
+                        conn->local_ip, conn->local_port);
 
         pr_debug("Moving to TARG_CONN_STATE_IN_LOGIN.\n");
         conn->conn_state        = TARG_CONN_STATE_IN_LOGIN;
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index a05ca1c4f01c..11287e1ece13 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -849,6 +849,17 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd)
         case ISCSI_OP_SCSI_TMFUNC:
                 transport_generic_free_cmd(&cmd->se_cmd, 1);
                 break;
+        case ISCSI_OP_REJECT:
+                /*
+                 * Handle special case for REJECT when iscsi_add_reject*() has
+                 * overwritten the original iscsi_opcode assignment, and the
+                 * associated cmd->se_cmd needs to be released.
+                 */
+                if (cmd->se_cmd.se_tfo != NULL) {
+                        transport_generic_free_cmd(&cmd->se_cmd, 1);
+                        break;
+                }
+                /* Fall-through */
         default:
                 iscsit_release_cmd(cmd);
                 break;
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 1b1edd14f4bf..01a2691dfb47 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -78,7 +78,7 @@ int target_emulate_report_target_port_groups(struct se_task *task)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
         list_for_each_entry(tg_pt_gp, &su_dev->t10_alua.tg_pt_gps_list,
@@ -163,7 +163,7 @@ int target_emulate_report_target_port_groups(struct se_task *task)
         buf[2] = ((rd_len >> 8) & 0xff);
         buf[3] = (rd_len & 0xff);
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
@@ -194,7 +194,7 @@ int target_emulate_set_target_port_groups(struct se_task *task)
                 cmd->scsi_sense_reason = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
                 return -EINVAL;
         }
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         /*
          * Determine if explict ALUA via SET_TARGET_PORT_GROUPS is allowed
@@ -351,7 +351,7 @@ int target_emulate_set_target_port_groups(struct se_task *task)
         }
 
 out:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
         return 0;
diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
index 2f2235edefff..f3d71fa88a28 100644
--- a/drivers/target/target_core_cdb.c
+++ b/drivers/target/target_core_cdb.c
@@ -83,7 +83,7 @@ target_emulate_inquiry_std(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         if (dev == tpg->tpg_virt_lun0.lun_se_dev) {
                 buf[0] = 0x3f; /* Not connected */
@@ -134,7 +134,7 @@ target_emulate_inquiry_std(struct se_cmd *cmd)
         buf[4] = 31; /* Set additional length to 31 */
 
 out:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         return 0;
 }
 
@@ -698,6 +698,13 @@ int target_emulate_inquiry(struct se_task *task)
         int p, ret;
 
         if (!(cdb[1] & 0x1)) {
+                if (cdb[2]) {
+                        pr_err("INQUIRY with EVPD==0 but PAGE CODE=%02x\n",
+                               cdb[2]);
+                        cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
+                        return -EINVAL;
+                }
+
                 ret = target_emulate_inquiry_std(cmd);
                 goto out;
         }
@@ -716,7 +723,7 @@ int target_emulate_inquiry(struct se_task *task)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = dev->transport->get_device_type(dev);
 
@@ -729,11 +736,11 @@ int target_emulate_inquiry(struct se_task *task)
         }
 
         pr_err("Unknown VPD Code: 0x%02x\n", cdb[2]);
-        cmd->scsi_sense_reason = TCM_UNSUPPORTED_SCSI_OPCODE;
+        cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
         ret = -EINVAL;
 
 out_unmap:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 out:
         if (!ret) {
                 task->task_scsi_status = GOOD;
@@ -755,7 +762,7 @@ int target_emulate_readcapacity(struct se_task *task)
         else
                 blocks = (u32)blocks_long;
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = (blocks >> 24) & 0xff;
         buf[1] = (blocks >> 16) & 0xff;
@@ -771,7 +778,7 @@ int target_emulate_readcapacity(struct se_task *task)
         if (dev->se_sub_dev->se_dev_attrib.emulate_tpu || dev->se_sub_dev->se_dev_attrib.emulate_tpws)
                 put_unaligned_be32(0xFFFFFFFF, &buf[0]);
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
@@ -785,7 +792,7 @@ int target_emulate_readcapacity_16(struct se_task *task)
         unsigned char *buf;
         unsigned long long blocks = dev->transport->get_blocks(dev);
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = (blocks >> 56) & 0xff;
         buf[1] = (blocks >> 48) & 0xff;
@@ -806,7 +813,7 @@ int target_emulate_readcapacity_16(struct se_task *task)
         if (dev->se_sub_dev->se_dev_attrib.emulate_tpu || dev->se_sub_dev->se_dev_attrib.emulate_tpws)
                 buf[14] = 0x80;
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
@@ -1019,9 +1026,9 @@ int target_emulate_modesense(struct se_task *task)
                         offset = cmd->data_length;
         }
 
-        rbuf = transport_kmap_first_data_page(cmd);
+        rbuf = transport_kmap_data_sg(cmd);
         memcpy(rbuf, buf, offset);
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
@@ -1043,7 +1050,7 @@ int target_emulate_request_sense(struct se_task *task)
                 return -ENOSYS;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         if (!core_scsi3_ua_clear_for_request_sense(cmd, &ua_asc, &ua_ascq)) {
                 /*
@@ -1051,11 +1058,8 @@ int target_emulate_request_sense(struct se_task *task)
                  */
                 buf[0] = 0x70;
                 buf[SPC_SENSE_KEY_OFFSET] = UNIT_ATTENTION;
-                /*
-                 * Make sure request data length is enough for additional
-                 * sense data.
-                 */
-                if (cmd->data_length <= 18) {
+
+                if (cmd->data_length < 18) {
                         buf[7] = 0x00;
                         err = -EINVAL;
                         goto end;
@@ -1072,11 +1076,8 @@ int target_emulate_request_sense(struct se_task *task)
                  */
                 buf[0] = 0x70;
                 buf[SPC_SENSE_KEY_OFFSET] = NO_SENSE;
-                /*
-                 * Make sure request data length is enough for additional
-                 * sense data.
-                 */
-                if (cmd->data_length <= 18) {
+
+                if (cmd->data_length < 18) {
                         buf[7] = 0x00;
                         err = -EINVAL;
                         goto end;
@@ -1089,7 +1090,7 @@ int target_emulate_request_sense(struct se_task *task)
         }
 
 end:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
         return 0;
@@ -1123,7 +1124,7 @@ int target_emulate_unmap(struct se_task *task)
         dl = get_unaligned_be16(&cdb[0]);
         bd_dl = get_unaligned_be16(&cdb[2]);
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         ptr = &buf[offset];
         pr_debug("UNMAP: Sub: %s Using dl: %hu bd_dl: %hu size: %hu"
@@ -1147,7 +1148,7 @@ int target_emulate_unmap(struct se_task *task)
         }
 
 err:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         if (!ret) {
                 task->task_scsi_status = GOOD;
                 transport_complete_task(task, 1);
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 0955bb8979fb..6e043eeb1db9 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -1704,13 +1704,15 @@ static ssize_t target_core_store_dev_alias(
                 return -EINVAL;
         }
 
-        se_dev->su_dev_flags |= SDF_USING_ALIAS;
         read_bytes = snprintf(&se_dev->se_dev_alias[0], SE_DEV_ALIAS_LEN,
                         "%s", page);
-
+        if (!read_bytes)
+                return -EINVAL;
         if (se_dev->se_dev_alias[read_bytes - 1] == '\n')
                 se_dev->se_dev_alias[read_bytes - 1] = '\0';
 
+        se_dev->su_dev_flags |= SDF_USING_ALIAS;
+
         pr_debug("Target_Core_ConfigFS: %s/%s set alias: %s\n",
                 config_item_name(&hba->hba_group.cg_item),
                 config_item_name(&se_dev->se_dev_group.cg_item),
@@ -1753,13 +1755,15 @@ static ssize_t target_core_store_dev_udev_path(
                 return -EINVAL;
         }
 
-        se_dev->su_dev_flags |= SDF_USING_UDEV_PATH;
         read_bytes = snprintf(&se_dev->se_dev_udev_path[0], SE_UDEV_PATH_LEN,
                         "%s", page);
-
+        if (!read_bytes)
+                return -EINVAL;
         if (se_dev->se_dev_udev_path[read_bytes - 1] == '\n')
                 se_dev->se_dev_udev_path[read_bytes - 1] = '\0';
 
+        se_dev->su_dev_flags |= SDF_USING_UDEV_PATH;
+
         pr_debug("Target_Core_ConfigFS: %s/%s set udev_path: %s\n",
                 config_item_name(&hba->hba_group.cg_item),
                 config_item_name(&se_dev->se_dev_group.cg_item),
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 0c5992f0d946..edbcabbf85f7 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -320,11 +320,12 @@ int core_free_device_list_for_node(
 void core_dec_lacl_count(struct se_node_acl *se_nacl, struct se_cmd *se_cmd)
 {
         struct se_dev_entry *deve;
+        unsigned long flags;
 
-        spin_lock_irq(&se_nacl->device_list_lock);
+        spin_lock_irqsave(&se_nacl->device_list_lock, flags);
         deve = &se_nacl->device_list[se_cmd->orig_fe_lun];
         deve->deve_cmds--;
-        spin_unlock_irq(&se_nacl->device_list_lock);
+        spin_unlock_irqrestore(&se_nacl->device_list_lock, flags);
 }
 
 void core_update_device_list_access(
@@ -656,7 +657,7 @@ int target_report_luns(struct se_task *se_task)
         unsigned char *buf;
         u32 cdb_offset = 0, lun_count = 0, offset = 8, i;
 
-        buf = transport_kmap_first_data_page(se_cmd);
+        buf = (unsigned char *) transport_kmap_data_sg(se_cmd);
 
         /*
          * If no struct se_session pointer is present, this struct se_cmd is
@@ -694,7 +695,7 @@ int target_report_luns(struct se_task *se_task)
          * See SPC3 r07, page 159.
          */
 done:
-        transport_kunmap_first_data_page(se_cmd);
+        transport_kunmap_data_sg(se_cmd);
         lun_count *= 8;
         buf[0] = ((lun_count >> 24) & 0xff);
         buf[1] = ((lun_count >> 16) & 0xff);
@@ -1294,24 +1295,26 @@ struct se_lun *core_dev_add_lun(
 {
         struct se_lun *lun_p;
         u32 lun_access = 0;
+        int rc;
 
         if (atomic_read(&dev->dev_access_obj.obj_access_count) != 0) {
                 pr_err("Unable to export struct se_device while dev_access_obj: %d\n",
                         atomic_read(&dev->dev_access_obj.obj_access_count));
-                return NULL;
+                return ERR_PTR(-EACCES);
         }
 
         lun_p = core_tpg_pre_addlun(tpg, lun);
-        if ((IS_ERR(lun_p)) || !lun_p)
-                return NULL;
+        if (IS_ERR(lun_p))
+                return lun_p;
 
         if (dev->dev_flags & DF_READ_ONLY)
                 lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
         else
                 lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
 
-        if (core_tpg_post_addlun(tpg, lun_p, lun_access, dev) < 0)
-                return NULL;
+        rc = core_tpg_post_addlun(tpg, lun_p, lun_access, dev);
+        if (rc < 0)
+                return ERR_PTR(rc);
 
         pr_debug("%s_TPG[%u]_LUN[%u] - Activated %s Logical Unit from"
                 " CORE HBA: %u\n", tpg->se_tpg_tfo->get_fabric_name(),
@@ -1348,11 +1351,10 @@ int core_dev_del_lun(
         u32 unpacked_lun)
 {
         struct se_lun *lun;
-        int ret = 0;
 
-        lun = core_tpg_pre_dellun(tpg, unpacked_lun, &ret);
-        if (!lun)
-                return ret;
+        lun = core_tpg_pre_dellun(tpg, unpacked_lun);
+        if (IS_ERR(lun))
+                return PTR_ERR(lun);
 
         core_tpg_post_dellun(tpg, lun);
 
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 4f77cce22646..9a2ce11e1a6e 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -766,9 +766,9 @@ static int target_fabric_port_link(
 
         lun_p = core_dev_add_lun(se_tpg, dev->se_hba, dev,
                                 lun->unpacked_lun);
-        if (IS_ERR(lun_p) || !lun_p) {
+        if (IS_ERR(lun_p)) {
                 pr_err("core_dev_add_lun() failed\n");
-                ret = -EINVAL;
+                ret = PTR_ERR(lun_p);
                 goto out;
         }
 
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index cc8e6b58ef20..8572eae62da7 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -129,7 +129,7 @@ static struct se_device *iblock_create_virtdevice(
         /*
          * These settings need to be made tunable..
          */
-        ib_dev->ibd_bio_set = bioset_create(32, 64);
+        ib_dev->ibd_bio_set = bioset_create(32, 0);
         if (!ib_dev->ibd_bio_set) {
                 pr_err("IBLOCK: Unable to create bioset()\n");
                 return ERR_PTR(-ENOMEM);
@@ -181,7 +181,7 @@ static struct se_device *iblock_create_virtdevice(
                  */
                 dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count = 1;
                 dev->se_sub_dev->se_dev_attrib.unmap_granularity =
-                                q->limits.discard_granularity;
+                                q->limits.discard_granularity >> 9;
                 dev->se_sub_dev->se_dev_attrib.unmap_granularity_alignment =
                                 q->limits.discard_alignment;
 
@@ -488,6 +488,13 @@ iblock_get_bio(struct se_task *task, sector_t lba, u32 sg_num)
         struct iblock_req *ib_req = IBLOCK_REQ(task);
         struct bio *bio;
 
+        /*
+         * Only allocate as many vector entries as the bio code allows us to,
+         * we'll loop later on until we have handled the whole request.
+         */
+        if (sg_num > BIO_MAX_PAGES)
+                sg_num = BIO_MAX_PAGES;
+
         bio = bio_alloc_bioset(GFP_NOIO, sg_num, ib_dev->ibd_bio_set);
         if (!bio) {
                 pr_err("Unable to allocate memory for bio\n");
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 26f135e94f6e..45001364788a 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -90,7 +90,7 @@ void	core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *);
 struct se_lun *core_tpg_pre_addlun(struct se_portal_group *, u32);
 int     core_tpg_post_addlun(struct se_portal_group *, struct se_lun *,
                 u32, void *);
-struct se_lun *core_tpg_pre_dellun(struct se_portal_group *, u32, int *);
+struct se_lun *core_tpg_pre_dellun(struct se_portal_group *, u32 unpacked_lun);
 int     core_tpg_post_dellun(struct se_portal_group *, struct se_lun *);
 
 /* target_core_transport.c */
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 429ad7291664..b7c779389eea 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -478,6 +478,7 @@ static int core_scsi3_pr_seq_non_holder(
         case READ_MEDIA_SERIAL_NUMBER:
         case REPORT_LUNS:
         case REQUEST_SENSE:
+        case PERSISTENT_RESERVE_IN:
                 ret = 0; /*/ Allowed CDBs */
                 break;
         default:
@@ -1534,7 +1535,7 @@ static int core_scsi3_decode_spec_i_port(
         tidh_new->dest_local_nexus = 1;
         list_add_tail(&tidh_new->dest_list, &tid_dest_list);
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         /*
          * For a PERSISTENT RESERVE OUT specify initiator ports payload,
          * first extract TransportID Parameter Data Length, and make sure
@@ -1785,7 +1786,7 @@ static int core_scsi3_decode_spec_i_port(
 
         }
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         /*
          * Go ahead and create a registrations from tid_dest_list for the
@@ -1833,7 +1834,7 @@ static int core_scsi3_decode_spec_i_port(
 
         return 0;
 out:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         /*
          * For the failure case, release everything from tid_dest_list
          * including *dest_pr_reg and the configfs dependances..
@@ -3120,7 +3121,7 @@ static int core_scsi3_pro_preempt(
                         if (!calling_it_nexus)
                                 core_scsi3_ua_allocate(pr_reg_nacl,
                                         pr_res_mapped_lun, 0x2A,
-                                        ASCQ_2AH_RESERVATIONS_PREEMPTED);
+                                        ASCQ_2AH_REGISTRATIONS_PREEMPTED);
                 }
                 spin_unlock(&pr_tmpl->registration_lock);
                 /*
@@ -3233,7 +3234,7 @@ static int core_scsi3_pro_preempt(
                  *    additional sense code set to REGISTRATIONS PREEMPTED;
                  */
                 core_scsi3_ua_allocate(pr_reg_nacl, pr_res_mapped_lun, 0x2A,
-                                ASCQ_2AH_RESERVATIONS_PREEMPTED);
+                                ASCQ_2AH_REGISTRATIONS_PREEMPTED);
         }
         spin_unlock(&pr_tmpl->registration_lock);
         /*
@@ -3410,14 +3411,14 @@ static int core_scsi3_emulate_pro_register_and_move(
          * will be moved to for the TransportID containing SCSI initiator WWN
          * information.
          */
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         rtpi = (buf[18] & 0xff) << 8;
         rtpi |= buf[19] & 0xff;
         tid_len = (buf[20] & 0xff) << 24;
         tid_len |= (buf[21] & 0xff) << 16;
         tid_len |= (buf[22] & 0xff) << 8;
         tid_len |= buf[23] & 0xff;
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         buf = NULL;
 
         if ((tid_len + 24) != cmd->data_length) {
@@ -3469,7 +3470,7 @@ static int core_scsi3_emulate_pro_register_and_move(
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         proto_ident = (buf[24] & 0x0f);
 #if 0
         pr_debug("SPC-3 PR REGISTER_AND_MOVE: Extracted Protocol Identifier:"
@@ -3503,7 +3504,7 @@ static int core_scsi3_emulate_pro_register_and_move(
                 goto out;
         }
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         buf = NULL;
 
         pr_debug("SPC-3 PR [%s] Extracted initiator %s identifier: %s"
@@ -3768,13 +3769,13 @@ after_iport_check:
                                         " REGISTER_AND_MOVE\n");
         }
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         core_scsi3_put_pr_reg(dest_pr_reg);
         return 0;
 out:
         if (buf)
-                transport_kunmap_first_data_page(cmd);
+                transport_kunmap_data_sg(cmd);
         if (dest_se_deve)
                 core_scsi3_lunacl_undepend_item(dest_se_deve);
         if (dest_node_acl)
@@ -3848,7 +3849,7 @@ int target_scsi3_emulate_pr_out(struct se_task *task)
         scope = (cdb[2] & 0xf0);
         type = (cdb[2] & 0x0f);
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         /*
          * From PERSISTENT_RESERVE_OUT parameter list (payload)
          */
@@ -3866,7 +3867,7 @@ int target_scsi3_emulate_pr_out(struct se_task *task)
                 aptpl = (buf[17] & 0x01);
                 unreg = (buf[17] & 0x02);
         }
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         buf = NULL;
 
         /*
@@ -3966,7 +3967,7 @@ static int core_scsi3_pri_read_keys(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);
         buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);
         buf[2] = ((su_dev->t10_pr.pr_generation >> 8) & 0xff);
@@ -4000,7 +4001,7 @@ static int core_scsi3_pri_read_keys(struct se_cmd *cmd)
         buf[6] = ((add_len >> 8) & 0xff);
         buf[7] = (add_len & 0xff);
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         return 0;
 }
@@ -4026,7 +4027,7 @@ static int core_scsi3_pri_read_reservation(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);
         buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);
         buf[2] = ((su_dev->t10_pr.pr_generation >> 8) & 0xff);
@@ -4085,7 +4086,7 @@ static int core_scsi3_pri_read_reservation(struct se_cmd *cmd)
 
 err:
         spin_unlock(&se_dev->dev_reservation_lock);
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         return 0;
 }
@@ -4109,7 +4110,7 @@ static int core_scsi3_pri_report_capabilities(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = ((add_len << 8) & 0xff);
         buf[1] = (add_len & 0xff);
@@ -4141,7 +4142,7 @@ static int core_scsi3_pri_report_capabilities(struct se_cmd *cmd)
         buf[4] |= 0x02; /* PR_TYPE_WRITE_EXCLUSIVE */
         buf[5] |= 0x01; /* PR_TYPE_EXCLUSIVE_ACCESS_ALLREG */
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         return 0;
 }
@@ -4171,7 +4172,7 @@ static int core_scsi3_pri_read_full_status(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);
         buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);
@@ -4292,7 +4293,7 @@ static int core_scsi3_pri_read_full_status(struct se_cmd *cmd)
         buf[6] = ((add_len >> 8) & 0xff);
         buf[7] = (add_len & 0xff);
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         return 0;
 }
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index d35467d42e12..8d4def30e9e8 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -693,7 +693,7 @@ static int pscsi_transport_complete(struct se_task *task)
 
                 if (task->task_se_cmd->se_deve->lun_flags &
                                 TRANSPORT_LUNFLAGS_READ_ONLY) {
-                        unsigned char *buf = transport_kmap_first_data_page(task->task_se_cmd);
+                        unsigned char *buf = transport_kmap_data_sg(task->task_se_cmd);
 
                         if (cdb[0] == MODE_SENSE_10) {
                                 if (!(buf[3] & 0x80))
@@ -703,7 +703,7 @@ static int pscsi_transport_complete(struct se_task *task)
                                         buf[2] |= 0x80;
                         }
 
-                        transport_kunmap_first_data_page(task->task_se_cmd);
+                        transport_kunmap_data_sg(task->task_se_cmd);
                 }
         }
 after_mode_sense:
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index b7668029bb31..06336ecd872d 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -807,8 +807,7 @@ static void core_tpg_shutdown_lun(
 
 struct se_lun *core_tpg_pre_dellun(
         struct se_portal_group *tpg,
-        u32 unpacked_lun,
-        int *ret)
+        u32 unpacked_lun)
 {
         struct se_lun *lun;
 
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index d3ddd1361949..58cea07b12fb 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1255,32 +1255,34 @@ static void core_setup_task_attr_emulation(struct se_device *dev)
 static void scsi_dump_inquiry(struct se_device *dev)
 {
         struct t10_wwn *wwn = &dev->se_sub_dev->t10_wwn;
+        char buf[17];
         int i, device_type;
         /*
          * Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer
          */
-        pr_debug("  Vendor: ");
         for (i = 0; i < 8; i++)
                 if (wwn->vendor[i] >= 0x20)
-                        pr_debug("%c", wwn->vendor[i]);
+                        buf[i] = wwn->vendor[i];
                 else
-                        pr_debug(" ");
+                        buf[i] = ' ';
+        buf[i] = '\0';
+        pr_debug("  Vendor: %s\n", buf);
 
-        pr_debug("  Model: ");
         for (i = 0; i < 16; i++)
                 if (wwn->model[i] >= 0x20)
-                        pr_debug("%c", wwn->model[i]);
+                        buf[i] = wwn->model[i];
                 else
-                        pr_debug(" ");
+                        buf[i] = ' ';
+        buf[i] = '\0';
+        pr_debug("  Model: %s\n", buf);
 
-        pr_debug("  Revision: ");
         for (i = 0; i < 4; i++)
                 if (wwn->revision[i] >= 0x20)
-                        pr_debug("%c", wwn->revision[i]);
+                        buf[i] = wwn->revision[i];
                 else
-                        pr_debug(" ");
-
-        pr_debug("\n");
+                        buf[i] = ' ';
+        buf[i] = '\0';
+        pr_debug("  Revision: %s\n", buf);
 
         device_type = dev->transport->get_device_type(dev);
         pr_debug("  Type:   %s ", scsi_device_type(device_type));
@@ -1655,7 +1657,7 @@ EXPORT_SYMBOL(transport_handle_cdb_direct);
  * This may only be called from process context, and also currently
  * assumes internal allocation of fabric payload buffer by target-core.
  **/
-int target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
+void target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
                 unsigned char *cdb, unsigned char *sense, u32 unpacked_lun,
                 u32 data_length, int task_attr, int data_dir, int flags)
 {
@@ -1688,15 +1690,21 @@ int target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
         /*
          * Locate se_lun pointer and attach it to struct se_cmd
          */
-        if (transport_lookup_cmd_lun(se_cmd, unpacked_lun) < 0)
-                goto out_check_cond;
+        if (transport_lookup_cmd_lun(se_cmd, unpacked_lun) < 0) {
+                transport_send_check_condition_and_sense(se_cmd,
+                                se_cmd->scsi_sense_reason, 0);
+                target_put_sess_cmd(se_sess, se_cmd);
+                return;
+        }
         /*
          * Sanitize CDBs via transport_generic_cmd_sequencer() and
          * allocate the necessary tasks to complete the received CDB+data
          */
         rc = transport_generic_allocate_tasks(se_cmd, cdb);
-        if (rc != 0)
-                goto out_check_cond;
+        if (rc != 0) {
+                transport_generic_request_failure(se_cmd);
+                return;
+        }
         /*
          * Dispatch se_cmd descriptor to se_lun->lun_se_dev backend
          * for immediate execution of READs, otherwise wait for
@@ -1704,12 +1712,7 @@ int target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
          * when fabric has filled the incoming buffer.
          */
         transport_handle_cdb_direct(se_cmd);
-        return 0;
-
-out_check_cond:
-        transport_send_check_condition_and_sense(se_cmd,
-                                se_cmd->scsi_sense_reason, 0);
-        return 0;
+        return;
 }
 EXPORT_SYMBOL(target_submit_cmd);
 
@@ -2694,7 +2697,7 @@ static int transport_generic_cmd_sequencer(
                         cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
 
                         if (target_check_write_same_discard(&cdb[10], dev) < 0)
-                                goto out_invalid_cdb_field;
+                                goto out_unsupported_cdb;
                         if (!passthrough)
                                 cmd->execute_task = target_emulate_write_same;
                         break;
@@ -2977,7 +2980,7 @@ static int transport_generic_cmd_sequencer(
                 cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
 
                 if (target_check_write_same_discard(&cdb[1], dev) < 0)
-                        goto out_invalid_cdb_field;
+                        goto out_unsupported_cdb;
                 if (!passthrough)
                         cmd->execute_task = target_emulate_write_same;
                 break;
@@ -3000,7 +3003,7 @@ static int transport_generic_cmd_sequencer(
                  * of byte 1 bit 3 UNMAP instead of original reserved field
                  */
                 if (target_check_write_same_discard(&cdb[1], dev) < 0)
-                        goto out_invalid_cdb_field;
+                        goto out_unsupported_cdb;
                 if (!passthrough)
                         cmd->execute_task = target_emulate_write_same;
                 break;
@@ -3082,11 +3085,6 @@ static int transport_generic_cmd_sequencer(
              (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)))
                 goto out_unsupported_cdb;
 
-        /* Let's limit control cdbs to a page, for simplicity's sake. */
-        if ((cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) &&
-            size > PAGE_SIZE)
-                goto out_invalid_cdb_field;
-
         transport_set_supported_SAM_opcode(cmd);
         return ret;
 
@@ -3490,9 +3488,11 @@ int transport_generic_map_mem_to_cmd(
 }
 EXPORT_SYMBOL(transport_generic_map_mem_to_cmd);
 
-void *transport_kmap_first_data_page(struct se_cmd *cmd)
+void *transport_kmap_data_sg(struct se_cmd *cmd)
 {
         struct scatterlist *sg = cmd->t_data_sg;
+        struct page **pages;
+        int i;
 
         BUG_ON(!sg);
         /*
@@ -3500,15 +3500,41 @@ void *transport_kmap_first_data_page(struct se_cmd *cmd)
          * tcm_loop who may be using a contig buffer from the SCSI midlayer for
          * control CDBs passed as SGLs via transport_generic_map_mem_to_cmd()
          */
-        return kmap(sg_page(sg)) + sg->offset;
+        if (!cmd->t_data_nents)
+                return NULL;
+        else if (cmd->t_data_nents == 1)
+                return kmap(sg_page(sg)) + sg->offset;
+
+        /* >1 page. use vmap */
+        pages = kmalloc(sizeof(*pages) * cmd->t_data_nents, GFP_KERNEL);
+        if (!pages)
+                return NULL;
+
+        /* convert sg[] to pages[] */
+        for_each_sg(cmd->t_data_sg, sg, cmd->t_data_nents, i) {
+                pages[i] = sg_page(sg);
+        }
+
+        cmd->t_data_vmap = vmap(pages, cmd->t_data_nents,  VM_MAP, PAGE_KERNEL);
+        kfree(pages);
+        if (!cmd->t_data_vmap)
+                return NULL;
+
+        return cmd->t_data_vmap + cmd->t_data_sg[0].offset;
 }
-EXPORT_SYMBOL(transport_kmap_first_data_page);
+EXPORT_SYMBOL(transport_kmap_data_sg);
 
-void transport_kunmap_first_data_page(struct se_cmd *cmd)
+void transport_kunmap_data_sg(struct se_cmd *cmd)
 {
-        kunmap(sg_page(cmd->t_data_sg));
+        if (!cmd->t_data_nents)
+                return;
+        else if (cmd->t_data_nents == 1)
+                kunmap(sg_page(cmd->t_data_sg));
+
+        vunmap(cmd->t_data_vmap);
+        cmd->t_data_vmap = NULL;
 }
-EXPORT_SYMBOL(transport_kunmap_first_data_page);
+EXPORT_SYMBOL(transport_kunmap_data_sg);
 
 static int
 transport_generic_get_mem(struct se_cmd *cmd)
@@ -3516,6 +3542,7 @@ transport_generic_get_mem(struct se_cmd *cmd)
         u32 length = cmd->data_length;
         unsigned int nents;
         struct page *page;
+        gfp_t zero_flag;
         int i = 0;
 
         nents = DIV_ROUND_UP(length, PAGE_SIZE);
@@ -3526,9 +3553,11 @@ transport_generic_get_mem(struct se_cmd *cmd)
         cmd->t_data_nents = nents;
         sg_init_table(cmd->t_data_sg, nents);
 
+        zero_flag = cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB ? 0 : __GFP_ZERO;
+
         while (length) {
                 u32 page_len = min_t(u32, length, PAGE_SIZE);
-                page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+                page = alloc_page(GFP_KERNEL | zero_flag);
                 if (!page)
                         goto out;
 
@@ -3756,6 +3785,11 @@ transport_allocate_control_task(struct se_cmd *cmd)
         struct se_task *task;
         unsigned long flags;
 
+        /* Workaround for handling zero-length control CDBs */
+        if ((cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) &&
+            !cmd->data_length)
+                return 0;
+
         task = transport_generic_get_task(cmd, cmd->data_direction);
         if (!task)
                 return -ENOMEM;
@@ -3827,6 +3861,14 @@ int transport_generic_new_cmd(struct se_cmd *cmd)
         else if (!task_cdbs && (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)) {
                 cmd->t_state = TRANSPORT_COMPLETE;
                 atomic_set(&cmd->t_transport_active, 1);
+
+                if (cmd->t_task_cdb[0] == REQUEST_SENSE) {
+                        u8 ua_asc = 0, ua_ascq = 0;
+
+                        core_scsi3_ua_clear_for_request_sense(cmd,
+                                        &ua_asc, &ua_ascq);
+                }
+
                 INIT_WORK(&cmd->work, target_complete_ok_work);
                 queue_work(target_completion_wq, &cmd->work);
                 return 0;
@@ -4448,8 +4490,8 @@ int transport_send_check_condition_and_sense(
                 /* CURRENT ERROR */
                 buffer[offset] = 0x70;
                 buffer[offset+SPC_ADD_SENSE_LEN_OFFSET] = 10;
-                /* ABORTED COMMAND */
-                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* ILLEGAL REQUEST */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ILLEGAL_REQUEST;
                 /* INVALID FIELD IN CDB */
                 buffer[offset+SPC_ASC_KEY_OFFSET] = 0x24;
                 break;
@@ -4457,8 +4499,8 @@ int transport_send_check_condition_and_sense(
                 /* CURRENT ERROR */
                 buffer[offset] = 0x70;
                 buffer[offset+SPC_ADD_SENSE_LEN_OFFSET] = 10;
-                /* ABORTED COMMAND */
-                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* ILLEGAL REQUEST */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ILLEGAL_REQUEST;
                 /* INVALID FIELD IN PARAMETER LIST */
                 buffer[offset+SPC_ASC_KEY_OFFSET] = 0x26;
                 break;
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index addc18f727ea..9e7e26c74c79 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -540,7 +540,6 @@ static void ft_send_work(struct work_struct *work)
         int data_dir = 0;
         u32 data_len;
         int task_attr;
-        int ret;
 
         fcp = fc_frame_payload_get(cmd->req_frame, sizeof(*fcp));
         if (!fcp)
@@ -603,14 +602,10 @@ static void ft_send_work(struct work_struct *work)
          * Use a single se_cmd->cmd_kref as we expect to release se_cmd
          * directly from ft_check_stop_free callback in response path.
          */
-        ret = target_submit_cmd(&cmd->se_cmd, cmd->sess->se_sess, cmd->cdb,
+        target_submit_cmd(&cmd->se_cmd, cmd->sess->se_sess, cmd->cdb,
                                 &cmd->ft_sense_buffer[0], cmd->lun, data_len,
                                 task_attr, data_dir, 0);
-        pr_debug("r_ctl %x alloc target_submit_cmd %d\n", fh->fh_r_ctl, ret);
-        if (ret < 0) {
-                ft_dump_cmd(cmd, __func__);
-                return;
-        }
+        pr_debug("r_ctl %x alloc target_submit_cmd\n", fh->fh_r_ctl);
         return;
 
 err:
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250/8250.c
index 9f50c4e3c2be..9f50c4e3c2be 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250/8250.c
diff --git a/drivers/tty/serial/8250.h b/drivers/tty/serial/8250/8250.h
index ae027be57e25..ae027be57e25 100644
--- a/drivers/tty/serial/8250.h
+++ b/drivers/tty/serial/8250/8250.h
diff --git a/drivers/tty/serial/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c
index 34b51c651192..34b51c651192 100644
--- a/drivers/tty/serial/8250_accent.c
+++ b/drivers/tty/serial/8250/8250_accent.c
diff --git a/drivers/tty/serial/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
index b0ce8c56f1a4..b0ce8c56f1a4 100644
--- a/drivers/tty/serial/8250_acorn.c
+++ b/drivers/tty/serial/8250/8250_acorn.c
diff --git a/drivers/tty/serial/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c
index d125dc107985..d125dc107985 100644
--- a/drivers/tty/serial/8250_boca.c
+++ b/drivers/tty/serial/8250/8250_boca.c
diff --git a/drivers/tty/serial/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index f574eef3075f..f574eef3075f 100644
--- a/drivers/tty/serial/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
diff --git a/drivers/tty/serial/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index eaafb98debed..eaafb98debed 100644
--- a/drivers/tty/serial/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
diff --git a/drivers/tty/serial/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
index bf53aabf9b5e..bf53aabf9b5e 100644
--- a/drivers/tty/serial/8250_exar_st16c554.c
+++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
diff --git a/drivers/tty/serial/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c
index be1582609626..be1582609626 100644
--- a/drivers/tty/serial/8250_fourport.c
+++ b/drivers/tty/serial/8250/8250_fourport.c
diff --git a/drivers/tty/serial/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
index f4d3c47b88e8..f4d3c47b88e8 100644
--- a/drivers/tty/serial/8250_fsl.c
+++ b/drivers/tty/serial/8250/8250_fsl.c
diff --git a/drivers/tty/serial/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c
index d8c0ffbfa6e3..d8c0ffbfa6e3 100644
--- a/drivers/tty/serial/8250_gsc.c
+++ b/drivers/tty/serial/8250/8250_gsc.c
diff --git a/drivers/tty/serial/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
index c13438c93012..c13438c93012 100644
--- a/drivers/tty/serial/8250_hp300.c
+++ b/drivers/tty/serial/8250/8250_hp300.c
diff --git a/drivers/tty/serial/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c
index a5c778e83de0..a5c778e83de0 100644
--- a/drivers/tty/serial/8250_hub6.c
+++ b/drivers/tty/serial/8250/8250_hub6.c
diff --git a/drivers/tty/serial/8250_mca.c b/drivers/tty/serial/8250/8250_mca.c
index d20abf04541e..d20abf04541e 100644
--- a/drivers/tty/serial/8250_mca.c
+++ b/drivers/tty/serial/8250/8250_mca.c
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index da2b0b0a183f..da2b0b0a183f 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
diff --git a/drivers/tty/serial/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index a2f236510ff1..a2f236510ff1 100644
--- a/drivers/tty/serial/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
new file mode 100644
index 000000000000..591f8018e7dd
--- /dev/null
+++ b/drivers/tty/serial/8250/Kconfig
@@ -0,0 +1,280 @@
+#
+# The 8250/16550 serial drivers.  You shouldn't be in this list unless
+# you somehow have an implicit or explicit dependency on SERIAL_8250.
+#
+
+config SERIAL_8250
+        tristate "8250/16550 and compatible serial support"
+        select SERIAL_CORE
+        ---help---
+          This selects whether you want to include the driver for the standard
+          serial ports.  The standard answer is Y.  People who might say N
+          here are those that are setting up dedicated Ethernet WWW/FTP
+          servers, or users that have one of the various bus mice instead of a
+          serial mouse and don't intend to use their machine's standard serial
+          port for anything.  (Note that the Cyclades and Stallion multi
+          serial port drivers do not need this driver built in for them to
+          work.)
+
+          To compile this driver as a module, choose M here: the
+          module will be called 8250.
+          [WARNING: Do not compile this driver as a module if you are using
+          non-standard serial ports, since the configuration information will
+          be lost when the driver is unloaded.  This limitation may be lifted
+          in the future.]
+
+          BTW1: If you have a mouseman serial mouse which is not recognized by
+          the X window system, try running gpm first.
+
+          BTW2: If you intend to use a software modem (also called Winmodem)
+          under Linux, forget it.  These modems are crippled and require
+          proprietary drivers which are only available under Windows.
+
+          Most people will say Y or M here, so that they can use serial mice,
+          modems and similar devices connecting to the standard serial ports.
+
+config SERIAL_8250_CONSOLE
+        bool "Console on 8250/16550 and compatible serial port"
+        depends on SERIAL_8250=y
+        select SERIAL_CORE_CONSOLE
+        ---help---
+          If you say Y here, it will be possible to use a serial port as the
+          system console (the system console is the device which receives all
+          kernel messages and warnings and which allows logins in single user
+          mode). This could be useful if some terminal or printer is connected
+          to that serial port.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyS1". (Try "man bootparam" or see the documentation of
+          your boot loader (grub or lilo or loadlin) about how to pass options
+          to the kernel at boot time.)
+
+          If you don't have a VGA card installed and you say Y here, the
+          kernel will automatically use the first serial line, /dev/ttyS0, as
+          system console.
+
+          You can set that using a kernel command line option such as
+          "console=uart8250,io,0x3f8,9600n8"
+          "console=uart8250,mmio,0xff5e0000,115200n8".
+          and it will switch to normal serial console when the corresponding
+          port is ready.
+          "earlycon=uart8250,io,0x3f8,9600n8"
+          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
+          it will not only setup early console.
+
+          If unsure, say N.
+
+config FIX_EARLYCON_MEM
+        bool
+        depends on X86
+        default y
+
+config SERIAL_8250_GSC
+        tristate
+        depends on SERIAL_8250 && GSC
+        default SERIAL_8250
+
+config SERIAL_8250_PCI
+        tristate "8250/16550 PCI device support" if EXPERT
+        depends on SERIAL_8250 && PCI
+        default SERIAL_8250
+        help
+          This builds standard PCI serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+          Saves about 9K.
+
+config SERIAL_8250_PNP
+        tristate "8250/16550 PNP device support" if EXPERT
+        depends on SERIAL_8250 && PNP
+        default SERIAL_8250
+        help
+          This builds standard PNP serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+
+config SERIAL_8250_HP300
+        tristate
+        depends on SERIAL_8250 && HP300
+        default SERIAL_8250
+
+config SERIAL_8250_CS
+        tristate "8250/16550 PCMCIA device support"
+        depends on PCMCIA && SERIAL_8250
+        ---help---
+          Say Y here to enable support for 16-bit PCMCIA serial devices,
+          including serial port cards, modems, and the modem functions of
+          multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
+          credit-card size devices often used with laptops.)
+
+          To compile this driver as a module, choose M here: the
+          module will be called serial_cs.
+
+          If unsure, say N.
+
+config SERIAL_8250_NR_UARTS
+        int "Maximum number of 8250/16550 serial ports"
+        depends on SERIAL_8250
+        default "4"
+        help
+          Set this to the number of serial ports you want the driver
+          to support.  This includes any ports discovered via ACPI or
+          PCI enumeration and any ports that may be added at run-time
+          via hot-plug, or any ISA multi-port serial cards.
+
+config SERIAL_8250_RUNTIME_UARTS
+        int "Number of 8250/16550 serial ports to register at runtime"
+        depends on SERIAL_8250
+        range 0 SERIAL_8250_NR_UARTS
+        default "4"
+        help
+          Set this to the maximum number of serial ports you want
+          the kernel to register at boot time.  This can be overridden
+          with the module parameter "nr_uarts", or boot-time parameter
+          8250.nr_uarts
+
+config SERIAL_8250_EXTENDED
+        bool "Extended 8250/16550 serial driver options"
+        depends on SERIAL_8250
+        help
+          If you wish to use any non-standard features of the standard "dumb"
+          driver, say Y here. This includes HUB6 support, shared serial
+          interrupts, special multiport support, support for more than the
+          four COM 1/2/3/4 boards, etc.
+
+          Note that the answer to this question won't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about serial driver options. If unsure, say N.
+
+config SERIAL_8250_MANY_PORTS
+        bool "Support more than 4 legacy serial ports"
+        depends on SERIAL_8250_EXTENDED && !IA64
+        help
+          Say Y here if you have dumb serial boards other than the four
+          standard COM 1/2/3/4 ports. This may happen if you have an AST
+          FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
+          from <http://www.tldp.org/docs.html#howto>), or other custom
+          serial port hardware which acts similar to standard serial port
+          hardware. If you only use the standard COM 1/2/3/4 ports, you can
+          say N here to save some memory. You can also say Y if you have an
+          "intelligent" multiport card such as Cyclades, Digiboards, etc.
+
+#
+# Multi-port serial cards
+#
+
+config SERIAL_8250_FOURPORT
+        tristate "Support Fourport cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have an AST FourPort serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_fourport.
+
+config SERIAL_8250_ACCENT
+        tristate "Support Accent cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have an Accent Async serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_accent.
+
+config SERIAL_8250_BOCA
+        tristate "Support Boca cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have a Boca serial board.  Please read the Boca
+          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_boca.
+
+config SERIAL_8250_EXAR_ST16C554
+        tristate "Support Exar ST16C554/554D Quad UART"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
+          tinkering with your Envoy TU301, or have a machine with this UART,
+          say Y here.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_exar_st16c554.
+
+config SERIAL_8250_HUB6
+        tristate "Support Hub6 cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have a HUB6 serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_hub6.
+
+#
+# Misc. options/drivers.
+#
+
+config SERIAL_8250_SHARE_IRQ
+        bool "Support for sharing serial interrupts"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Some serial boards have hardware support which allows multiple dumb
+          serial ports on the same board to share a single IRQ. To enable
+          support for this in the serial driver, say Y here.
+
+config SERIAL_8250_DETECT_IRQ
+        bool "Autodetect IRQ on standard ports (unsafe)"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Say Y here if you want the kernel to try to guess which IRQ
+          to use for your serial port.
+
+          This is considered unsafe; it is far better to configure the IRQ in
+          a boot script using the setserial command.
+
+          If unsure, say N.
+
+config SERIAL_8250_RSA
+        bool "Support RSA serial ports"
+        depends on SERIAL_8250_EXTENDED
+        help
+          ::: To be written :::
+
+config SERIAL_8250_MCA
+        tristate "Support 8250-type ports on MCA buses"
+        depends on SERIAL_8250 != n && MCA
+        help
+          Say Y here if you have a MCA serial ports.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_mca.
+
+config SERIAL_8250_ACORN
+        tristate "Acorn expansion card serial port support"
+        depends on ARCH_ACORN && SERIAL_8250
+        help
+          If you have an Atomwide Serial card or Serial Port card for an Acorn
+          system, say Y to this option.  The driver can handle 1, 2, or 3 port
+          cards.  If unsure, say N.
+
+config SERIAL_8250_RM9K
+        bool "Support for MIPS RM9xxx integrated serial port"
+        depends on SERIAL_8250 != n && SERIAL_RM9000
+        select SERIAL_8250_SHARE_IRQ
+        help
+          Selecting this option will add support for the integrated serial
+          port hardware found on MIPS RM9122 and similar processors.
+          If unsure, say N.
+
+config SERIAL_8250_FSL
+        bool
+        depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
+        default PPC
+
+config SERIAL_8250_DW
+        tristate "Support for Synopsys DesignWare 8250 quirks"
+        depends on SERIAL_8250 && OF
+        help
+          Selecting this option will enable handling of the extra features
+          present in the Synopsys DesignWare APB UART.
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
new file mode 100644
index 000000000000..867bba738908
--- /dev/null
+++ b/drivers/tty/serial/8250/Makefile
@@ -0,0 +1,20 @@
+#
+# Makefile for the 8250 serial device drivers.
+#
+
+obj-$(CONFIG_SERIAL_8250)               += 8250.o
+obj-$(CONFIG_SERIAL_8250_PNP)           += 8250_pnp.o
+obj-$(CONFIG_SERIAL_8250_GSC)           += 8250_gsc.o
+obj-$(CONFIG_SERIAL_8250_PCI)           += 8250_pci.o
+obj-$(CONFIG_SERIAL_8250_HP300)         += 8250_hp300.o
+obj-$(CONFIG_SERIAL_8250_CS)            += serial_cs.o
+obj-$(CONFIG_SERIAL_8250_ACORN)         += 8250_acorn.o
+obj-$(CONFIG_SERIAL_8250_CONSOLE)       += 8250_early.o
+obj-$(CONFIG_SERIAL_8250_FOURPORT)      += 8250_fourport.o
+obj-$(CONFIG_SERIAL_8250_ACCENT)        += 8250_accent.o
+obj-$(CONFIG_SERIAL_8250_BOCA)          += 8250_boca.o
+obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
+obj-$(CONFIG_SERIAL_8250_HUB6)          += 8250_hub6.o
+obj-$(CONFIG_SERIAL_8250_MCA)           += 8250_mca.o
+obj-$(CONFIG_SERIAL_8250_FSL)           += 8250_fsl.o
+obj-$(CONFIG_SERIAL_8250_DW)            += 8250_dw.o
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/8250/m32r_sio.c
index 94a6792bf97b..94a6792bf97b 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/8250/m32r_sio.c
diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/8250/m32r_sio.h
index e9b7e11793b1..e9b7e11793b1 100644
--- a/drivers/tty/serial/m32r_sio.h
+++ b/drivers/tty/serial/8250/m32r_sio.h
diff --git a/drivers/tty/serial/m32r_sio_reg.h b/drivers/tty/serial/8250/m32r_sio_reg.h
index 4671473793e3..4671473793e3 100644
--- a/drivers/tty/serial/m32r_sio_reg.h
+++ b/drivers/tty/serial/8250/m32r_sio_reg.h
diff --git a/drivers/tty/serial/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index 86090605a84e..86090605a84e 100644
--- a/drivers/tty/serial/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index aca2386c5ef1..2de99248dfae 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -5,279 +5,7 @@
 menu "Serial drivers"
         depends on HAS_IOMEM
 
-#
-# The new 8250/16550 serial drivers
-config SERIAL_8250
-        tristate "8250/16550 and compatible serial support"
-        select SERIAL_CORE
-        ---help---
-          This selects whether you want to include the driver for the standard
-          serial ports.  The standard answer is Y.  People who might say N
-          here are those that are setting up dedicated Ethernet WWW/FTP
-          servers, or users that have one of the various bus mice instead of a
-          serial mouse and don't intend to use their machine's standard serial
-          port for anything.  (Note that the Cyclades and Stallion multi
-          serial port drivers do not need this driver built in for them to
-          work.)
-
-          To compile this driver as a module, choose M here: the
-          module will be called 8250.
-          [WARNING: Do not compile this driver as a module if you are using
-          non-standard serial ports, since the configuration information will
-          be lost when the driver is unloaded.  This limitation may be lifted
-          in the future.]
-
-          BTW1: If you have a mouseman serial mouse which is not recognized by
-          the X window system, try running gpm first.
-
-          BTW2: If you intend to use a software modem (also called Winmodem)
-          under Linux, forget it.  These modems are crippled and require
-          proprietary drivers which are only available under Windows.
-
-          Most people will say Y or M here, so that they can use serial mice,
-          modems and similar devices connecting to the standard serial ports.
-
-config SERIAL_8250_CONSOLE
-        bool "Console on 8250/16550 and compatible serial port"
-        depends on SERIAL_8250=y
-        select SERIAL_CORE_CONSOLE
-        ---help---
-          If you say Y here, it will be possible to use a serial port as the
-          system console (the system console is the device which receives all
-          kernel messages and warnings and which allows logins in single user
-          mode). This could be useful if some terminal or printer is connected
-          to that serial port.
-
-          Even if you say Y here, the currently visible virtual console
-          (/dev/tty0) will still be used as the system console by default, but
-          you can alter that using a kernel command line option such as
-          "console=ttyS1". (Try "man bootparam" or see the documentation of
-          your boot loader (grub or lilo or loadlin) about how to pass options
-          to the kernel at boot time.)
-
-          If you don't have a VGA card installed and you say Y here, the
-          kernel will automatically use the first serial line, /dev/ttyS0, as
-          system console.
-
-          You can set that using a kernel command line option such as
-          "console=uart8250,io,0x3f8,9600n8"
-          "console=uart8250,mmio,0xff5e0000,115200n8".
-          and it will switch to normal serial console when the corresponding 
-          port is ready.
-          "earlycon=uart8250,io,0x3f8,9600n8"
-          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
-          it will not only setup early console.
-
-          If unsure, say N.
-
-config FIX_EARLYCON_MEM
-        bool
-        depends on X86
-        default y
-
-config SERIAL_8250_GSC
-        tristate
-        depends on SERIAL_8250 && GSC
-        default SERIAL_8250
-
-config SERIAL_8250_PCI
-        tristate "8250/16550 PCI device support" if EXPERT
-        depends on SERIAL_8250 && PCI
-        default SERIAL_8250
-        help
-          This builds standard PCI serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-          Saves about 9K.
-
-config SERIAL_8250_PNP
-        tristate "8250/16550 PNP device support" if EXPERT
-        depends on SERIAL_8250 && PNP
-        default SERIAL_8250
-        help
-          This builds standard PNP serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-
-config SERIAL_8250_FSL
-        bool
-        depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
-        default PPC
-
-config SERIAL_8250_HP300
-        tristate
-        depends on SERIAL_8250 && HP300
-        default SERIAL_8250
-
-config SERIAL_8250_CS
-        tristate "8250/16550 PCMCIA device support"
-        depends on PCMCIA && SERIAL_8250
-        ---help---
-          Say Y here to enable support for 16-bit PCMCIA serial devices,
-          including serial port cards, modems, and the modem functions of
-          multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
-          credit-card size devices often used with laptops.)
-
-          To compile this driver as a module, choose M here: the
-          module will be called serial_cs.
-
-          If unsure, say N.
-
-config SERIAL_8250_NR_UARTS
-        int "Maximum number of 8250/16550 serial ports"
-        depends on SERIAL_8250
-        default "4"
-        help
-          Set this to the number of serial ports you want the driver
-          to support.  This includes any ports discovered via ACPI or
-          PCI enumeration and any ports that may be added at run-time
-          via hot-plug, or any ISA multi-port serial cards.
-
-config SERIAL_8250_RUNTIME_UARTS
-        int "Number of 8250/16550 serial ports to register at runtime"
-        depends on SERIAL_8250
-        range 0 SERIAL_8250_NR_UARTS
-        default "4"
-        help
-          Set this to the maximum number of serial ports you want
-          the kernel to register at boot time.  This can be overridden
-          with the module parameter "nr_uarts", or boot-time parameter
-          8250.nr_uarts
-
-config SERIAL_8250_EXTENDED
-        bool "Extended 8250/16550 serial driver options"
-        depends on SERIAL_8250
-        help
-          If you wish to use any non-standard features of the standard "dumb"
-          driver, say Y here. This includes HUB6 support, shared serial
-          interrupts, special multiport support, support for more than the
-          four COM 1/2/3/4 boards, etc.
-
-          Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about serial driver options. If unsure, say N.
-
-config SERIAL_8250_MANY_PORTS
-        bool "Support more than 4 legacy serial ports"
-        depends on SERIAL_8250_EXTENDED && !IA64
-        help
-          Say Y here if you have dumb serial boards other than the four
-          standard COM 1/2/3/4 ports. This may happen if you have an AST
-          FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
-          from <http://www.tldp.org/docs.html#howto>), or other custom
-          serial port hardware which acts similar to standard serial port
-          hardware. If you only use the standard COM 1/2/3/4 ports, you can
-          say N here to save some memory. You can also say Y if you have an
-          "intelligent" multiport card such as Cyclades, Digiboards, etc.
-
-#
-# Multi-port serial cards
-#
-
-config SERIAL_8250_FOURPORT
-        tristate "Support Fourport cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have an AST FourPort serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_fourport.
-
-config SERIAL_8250_ACCENT
-        tristate "Support Accent cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have an Accent Async serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_accent.
-
-config SERIAL_8250_BOCA
-        tristate "Support Boca cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have a Boca serial board.  Please read the Boca
-          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_boca.
-
-config SERIAL_8250_EXAR_ST16C554
-        tristate "Support Exar ST16C554/554D Quad UART"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
-          tinkering with your Envoy TU301, or have a machine with this UART,
-          say Y here.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_exar_st16c554.
-
-config SERIAL_8250_HUB6
-        tristate "Support Hub6 cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have a HUB6 serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_hub6.
-
-config SERIAL_8250_SHARE_IRQ
-        bool "Support for sharing serial interrupts"
-        depends on SERIAL_8250_EXTENDED
-        help
-          Some serial boards have hardware support which allows multiple dumb
-          serial ports on the same board to share a single IRQ. To enable
-          support for this in the serial driver, say Y here.
-
-config SERIAL_8250_DETECT_IRQ
-        bool "Autodetect IRQ on standard ports (unsafe)"
-        depends on SERIAL_8250_EXTENDED
-        help
-          Say Y here if you want the kernel to try to guess which IRQ
-          to use for your serial port.
-
-          This is considered unsafe; it is far better to configure the IRQ in
-          a boot script using the setserial command.
-
-          If unsure, say N.
-
-config SERIAL_8250_RSA
-        bool "Support RSA serial ports"
-        depends on SERIAL_8250_EXTENDED
-        help
-          ::: To be written :::
-
-config SERIAL_8250_MCA
-        tristate "Support 8250-type ports on MCA buses"
-        depends on SERIAL_8250 != n && MCA
-        help
-          Say Y here if you have a MCA serial ports.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_mca.
-
-config SERIAL_8250_ACORN
-        tristate "Acorn expansion card serial port support"
-        depends on ARCH_ACORN && SERIAL_8250
-        help
-          If you have an Atomwide Serial card or Serial Port card for an Acorn
-          system, say Y to this option.  The driver can handle 1, 2, or 3 port
-          cards.  If unsure, say N.
-
-config SERIAL_8250_RM9K
-        bool "Support for MIPS RM9xxx integrated serial port"
-        depends on SERIAL_8250 != n && SERIAL_RM9000
-        select SERIAL_8250_SHARE_IRQ
-        help
-          Selecting this option will add support for the integrated serial
-          port hardware found on MIPS RM9122 and similar processors.
-          If unsure, say N.
-
-config SERIAL_8250_DW
-        tristate "Support for Synopsys DesignWare 8250 quirks"
-        depends on SERIAL_8250 && OF
-        help
-          Selecting this option will enable handling of the extra features
-          present in the Synopsys DesignWare APB UART.
+source "drivers/tty/serial/8250/Kconfig"
 
 comment "Non-8250 serial port support"
 
@@ -536,15 +264,6 @@ config SERIAL_MAX3107
         help
           MAX3107 chip support
 
-config SERIAL_MAX3107_AAVA
-        tristate "MAX3107 AAVA platform support"
-        depends on X86_MRST && SERIAL_MAX3107 && GPIOLIB
-        select SERIAL_CORE
-        help
-          Support for the MAX3107 chip configuration found on the AAVA
-          platform. Includes the extra initialisation and GPIO support
-          neded for this device.
-
 config SERIAL_DZ
         bool "DECstation DZ serial driver"
         depends on MACH_DECSTATION && 32BIT
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index f5b01f2ce525..fef32e10c851 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -14,22 +14,9 @@ obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
 obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
 obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
 
-obj-$(CONFIG_SERIAL_8250) += 8250.o
-obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
-obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
-obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
-obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
-obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
-obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
-obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
-obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o
-obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
-obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
-obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
-obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
-obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
-obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
-obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
+# Now bring in any enabled 8250/16450/16550 type drivers.
+obj-$(CONFIG_SERIAL_8250) += 8250/
+
 obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
 obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
 obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
@@ -42,7 +29,6 @@ obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
 obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
 obj-$(CONFIG_SERIAL_MAX3107) += max3107.o
-obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o
 obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
 obj-$(CONFIG_SERIAL_MUX) += mux.o
 obj-$(CONFIG_SERIAL_68328) += 68328serial.o
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 9ae024025ff3..6800f5f26241 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -159,6 +159,7 @@ struct uart_amba_port {
         unsigned int            fifosize;       /* vendor-specific */
         unsigned int            lcrh_tx;        /* vendor-specific */
         unsigned int            lcrh_rx;        /* vendor-specific */
+        unsigned int            old_cr;         /* state during shutdown */
         bool                    autorts;
         char                    type[12];
         bool                    interrupt_may_hang; /* vendor-specific */
@@ -1411,7 +1412,9 @@ static int pl011_startup(struct uart_port *port)
         while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY)
                 barrier();
 
-        cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
+        /* restore RTS and DTR */
+        cr = uap->old_cr & (UART011_CR_RTS | UART011_CR_DTR);
+        cr |= UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
         writew(cr, uap->port.membase + UART011_CR);
 
         /* Clear pending error interrupts */
@@ -1469,6 +1472,7 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap,
 static void pl011_shutdown(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int cr;
 
         /*
          * disable all interrupts
@@ -1488,9 +1492,16 @@ static void pl011_shutdown(struct uart_port *port)
 
         /*
          * disable the port
+         * disable the port. It should not disable RTS and DTR.
+         * Also RTS and DTR state should be preserved to restore
+         * it during startup().
          */
         uap->autorts = false;
-        writew(UART01x_CR_UARTEN | UART011_CR_TXE, uap->port.membase + UART011_CR);
+        cr = readw(uap->port.membase + UART011_CR);
+        uap->old_cr = cr;
+        cr &= UART011_CR_RTS | UART011_CR_DTR;
+        cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
+        writew(cr, uap->port.membase + UART011_CR);
 
         /*
          * disable break condition and fifos
@@ -1740,9 +1751,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_amba_port *uap = amba_ports[co->index];
         unsigned int status, old_cr, new_cr;
+        unsigned long flags;
+        int locked = 1;
 
         clk_enable(uap->clk);
 
+        local_irq_save(flags);
+        if (uap->port.sysrq)
+                locked = 0;
+        else if (oops_in_progress)
+                locked = spin_trylock(&uap->port.lock);
+        else
+                spin_lock(&uap->port.lock);
+
         /*
          *      First save the CR then disable the interrupts
          */
@@ -1762,6 +1783,10 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
         } while (status & UART01x_FR_BUSY);
         writew(old_cr, uap->port.membase + UART011_CR);
 
+        if (locked)
+                spin_unlock(&uap->port.lock);
+        local_irq_restore(flags);
+
         clk_disable(uap->clk);
 }
 
@@ -1905,6 +1930,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
         uap->vendor = vendor;
         uap->lcrh_rx = vendor->lcrh_rx;
         uap->lcrh_tx = vendor->lcrh_tx;
+        uap->old_cr = 0;
         uap->fifosize = vendor->fifosize;
         uap->interrupt_may_hang = vendor->interrupt_may_hang;
         uap->port.dev = &dev->dev;
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 7c867a046c97..7545fe1b9925 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -251,6 +251,7 @@ static void jsm_io_resume(struct pci_dev *pdev)
         struct jsm_board *brd = pci_get_drvdata(pdev);
 
         pci_restore_state(pdev);
+        pci_save_state(pdev);
 
         jsm_uart_port_init(brd);
 }
diff --git a/drivers/tty/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
deleted file mode 100644
index aae772a71de6..000000000000
--- a/drivers/tty/serial/max3107-aava.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- *  max3107.c - spi uart protocol driver for Maxim 3107
- *  Based on max3100.c
- *      by Christian Pellegrin <chripell@evolware.org>
- *  and max3110.c
- *      by Feng Tang <feng.tang@intel.com>
- *
- *  Copyright (C) Aavamobile 2009
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- */
-
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/spi/spi.h>
-#include <linux/freezer.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/sfi.h>
-#include <linux/module.h>
-#include <asm/mrst.h>
-#include "max3107.h"
-
-/* GPIO direction to input function */
-static int max3107_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[1];             /* Buffer for SPI transfer */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO configuration register */
-        buf[0] = MAX3107_GPIOCFG_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO read failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Set GPIO to input */
-        buf[0] &= ~(0x0001 << offset);
-
-        /* Write new GPIO configuration register value */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO write failed\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-/* GPIO direction to output function */
-static int max3107_gpio_direction_out(struct gpio_chip *chip, unsigned offset,
-                                        int value)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[2];     /* Buffer for SPI transfers */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO configuration and data registers */
-        buf[0] = MAX3107_GPIOCFG_REG;
-        buf[1] = MAX3107_GPIODATA_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) {
-                dev_err(&s->spi->dev, "SPI transfer gpio failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-        buf[1] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Set GPIO to output */
-        buf[0] |= (0x0001 << offset);
-        /* Set value */
-        if (value)
-                buf[1] |= (0x0001 << offset);
-        else
-                buf[1] &= ~(0x0001 << offset);
-
-        /* Write new GPIO configuration and data register values */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG);
-        buf[1] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 4)) {
-                dev_err(&s->spi->dev,
-                        "SPI transfer for GPIO conf data w failed\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-/* GPIO value query function */
-static int max3107_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[1];     /* Buffer for SPI transfer */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO data register */
-        buf[0] = MAX3107_GPIODATA_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO data r failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Return value */
-        return buf[0] & (0x0001 << offset);
-}
-
-/* GPIO value set function */
-static void max3107_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[2];     /* Buffer for SPI transfers */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return;
-        }
-
-        /* Read current GPIO configuration registers*/
-        buf[0] = MAX3107_GPIODATA_REG;
-        buf[1] = MAX3107_GPIOCFG_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) {
-                dev_err(&s->spi->dev,
-                        "SPI transfer for GPIO data and config read failed\n");
-                return;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-        buf[1] &= MAX3107_SPI_RX_DATA_MASK;
-
-        if (!(buf[1] & (0x0001 << offset))) {
-                /* Configured as input, can't set value */
-                dev_warn(&s->spi->dev,
-                                "Trying to set value for input GPIO\n");
-                return;
-        }
-
-        /* Set value */
-        if (value)
-                buf[0] |= (0x0001 << offset);
-        else
-                buf[0] &= ~(0x0001 << offset);
-
-        /* Write new GPIO data register value */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 2))
-                dev_err(&s->spi->dev, "SPI transfer GPIO data w failed\n");
-}
-
-/* GPIO chip data */
-static struct gpio_chip max3107_gpio_chip = {
-        .owner                  = THIS_MODULE,
-        .direction_input        = max3107_gpio_direction_in,
-        .direction_output       = max3107_gpio_direction_out,
-        .get                    = max3107_gpio_get,
-        .set                    = max3107_gpio_set,
-        .can_sleep              = 1,
-        .base                   = MAX3107_GPIO_BASE,
-        .ngpio                  = MAX3107_GPIO_COUNT,
-};
-
-/**
- *      max3107_aava_reset      -       reset on AAVA systems
- *      @spi: The SPI device we are probing
- *
- *      Reset the device ready for probing.
- */
-
-static int max3107_aava_reset(struct spi_device *spi)
-{
-        /* Reset the chip */
-        if (gpio_request(MAX3107_RESET_GPIO, "max3107")) {
-                pr_err("Requesting RESET GPIO failed\n");
-                return -EIO;
-        }
-        if (gpio_direction_output(MAX3107_RESET_GPIO, 0)) {
-                pr_err("Setting RESET GPIO to 0 failed\n");
-                gpio_free(MAX3107_RESET_GPIO);
-                return -EIO;
-        }
-        msleep(MAX3107_RESET_DELAY);
-        if (gpio_direction_output(MAX3107_RESET_GPIO, 1)) {
-                pr_err("Setting RESET GPIO to 1 failed\n");
-                gpio_free(MAX3107_RESET_GPIO);
-                return -EIO;
-        }
-        gpio_free(MAX3107_RESET_GPIO);
-        msleep(MAX3107_WAKEUP_DELAY);
-        return 0;
-}
-
-static int max3107_aava_configure(struct max3107_port *s)
-{
-        int retval;
-
-        /* Initialize GPIO chip data */
-        s->chip = max3107_gpio_chip;
-        s->chip.label = s->spi->modalias;
-        s->chip.dev = &s->spi->dev;
-
-        /* Add GPIO chip */
-        retval = gpiochip_add(&s->chip);
-        if (retval) {
-                dev_err(&s->spi->dev, "Adding GPIO chip failed\n");
-                return retval;
-        }
-
-        /* Temporary fix for EV2 boot problems, set modem reset to 0 */
-        max3107_gpio_direction_out(&s->chip, 3, 0);
-        return 0;
-}
-
-#if 0
-/* This will get enabled once we have the board stuff merged for this
-   specific case */
-
-static const struct baud_table brg13_ext[] = {
-        { 300,    MAX3107_BRG13_B300 },
-        { 600,    MAX3107_BRG13_B600 },
-        { 1200,   MAX3107_BRG13_B1200 },
-        { 2400,   MAX3107_BRG13_B2400 },
-        { 4800,   MAX3107_BRG13_B4800 },
-        { 9600,   MAX3107_BRG13_B9600 },
-        { 19200,  MAX3107_BRG13_B19200 },
-        { 57600,  MAX3107_BRG13_B57600 },
-        { 115200, MAX3107_BRG13_B115200 },
-        { 230400, MAX3107_BRG13_B230400 },
-        { 460800, MAX3107_BRG13_B460800 },
-        { 921600, MAX3107_BRG13_B921600 },
-        { 0, 0 }
-};
-
-static void max3107_aava_init(struct max3107_port *s)
-{
-        /*override for AAVA SC specific*/
-        if (mrst_platform_id() == MRST_PLATFORM_AAVA_SC) {
-                if (get_koski_build_id() <= KOSKI_EV2)
-                        if (s->ext_clk) {
-                                s->brg_cfg = MAX3107_BRG13_B9600;
-                                s->baud_tbl = (struct baud_table *)brg13_ext;
-                        }
-        }
-}
-#endif
-
-static int __devexit max3107_aava_remove(struct spi_device *spi)
-{
-        struct max3107_port *s = dev_get_drvdata(&spi->dev);
-
-        /* Remove GPIO chip */
-        if (gpiochip_remove(&s->chip))
-                dev_warn(&spi->dev, "Removing GPIO chip failed\n");
-
-        /* Then do the default remove */
-        return max3107_remove(spi);
-}
-
-/* Platform data */
-static struct max3107_plat aava_plat_data = {
-        .loopback               = 0,
-        .ext_clk                = 1,
-/*      .init                   = max3107_aava_init, */
-        .configure              = max3107_aava_configure,
-        .hw_suspend             = max3107_hw_susp,
-        .polled_mode            = 0,
-        .poll_time              = 0,
-};
-
-
-static int __devinit max3107_probe_aava(struct spi_device *spi)
-{
-        int err = max3107_aava_reset(spi);
-        if (err < 0)
-                return err;
-        return max3107_probe(spi, &aava_plat_data);
-}
-
-/* Spi driver data */
-static struct spi_driver max3107_driver = {
-        .driver = {
-                .name           = "aava-max3107",
-                .owner          = THIS_MODULE,
-        },
-        .probe          = max3107_probe_aava,
-        .remove         = __devexit_p(max3107_aava_remove),
-        .suspend        = max3107_suspend,
-        .resume         = max3107_resume,
-};
-
-/* Driver init function */
-static int __init max3107_init(void)
-{
-        return spi_register_driver(&max3107_driver);
-}
-
-/* Driver exit function */
-static void __exit max3107_exit(void)
-{
-        spi_unregister_driver(&max3107_driver);
-}
-
-module_init(max3107_init);
-module_exit(max3107_exit);
-
-MODULE_DESCRIPTION("MAX3107 driver");
-MODULE_AUTHOR("Aavamobile");
-MODULE_ALIAS("spi:aava-max3107");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index d192dcbb82f5..1c2426931484 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1160,7 +1160,7 @@ static struct uart_driver serial_omap_reg = {
         .cons           = OMAP_CONSOLE,
 };
 
-#ifdef CONFIG_SUSPEND
+#ifdef CONFIG_PM_SLEEP
 static int serial_omap_suspend(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
@@ -1521,6 +1521,7 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1)
         }
 }
 
+#ifdef CONFIG_PM_RUNTIME
 static void serial_omap_restore_context(struct uart_omap_port *up)
 {
         if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
@@ -1550,7 +1551,6 @@ static void serial_omap_restore_context(struct uart_omap_port *up)
                 serial_out(up, UART_OMAP_MDR1, up->mdr1);
 }
 
-#ifdef CONFIG_PM_RUNTIME
 static int serial_omap_runtime_suspend(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index c7bf31a6a7e7..13056180adf5 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2348,11 +2348,11 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
          */
         tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev);
         if (likely(!IS_ERR(tty_dev))) {
-                device_init_wakeup(tty_dev, 1);
-                device_set_wakeup_enable(tty_dev, 0);
-        } else
+                device_set_wakeup_capable(tty_dev, 1);
+        } else {
                 printk(KERN_ERR "Cannot register tty device on line %d\n",
                        uport->line);
+        }
 
         /*
          * Ensure UPF_DEAD is not set.
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index ef9dd628ba0b..bf6e238146ae 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -227,7 +227,6 @@ int tty_port_block_til_ready(struct tty_port *port,
         int do_clocal = 0, retval;
         unsigned long flags;
         DEFINE_WAIT(wait);
-        int cd;
 
         /* block if port is in the process of being closed */
         if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
@@ -284,11 +283,14 @@ int tty_port_block_til_ready(struct tty_port *port,
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                /* Probe the carrier. For devices with no carrier detect this
-                   will always return true */
-                cd = tty_port_carrier_raised(port);
+                /*
+                 * Probe the carrier. For devices with no carrier detect
+                 * tty_port_carrier_raised will always return true.
+                 * Never ask drivers if CLOCAL is set, this causes troubles
+                 * on some hardware.
+                 */
                 if (!(port->flags & ASYNC_CLOSING) &&
-                                (do_clocal || cd))
+                                (do_clocal || tty_port_carrier_raised(port)))
                         break;
                 if (signal_pending(current)) {
                         retval = -ERESTARTSYS;
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 5e096f43bcea..65447c5f91d7 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -1463,7 +1463,6 @@ compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
         if (!perm && op->op != KD_FONT_OP_GET)
                 return -EPERM;
         op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
-        op->flags |= KD_FONT_FLAG_OLD;
         i = con_font_op(vc, op);
         if (i)
                 return i;
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 1c50baff7725..d2b3cffca3f7 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -57,6 +57,8 @@ MODULE_DEVICE_TABLE (usb, wdm_ids);
 
 #define WDM_MAX                 16
 
+/* CDC-WMC r1.1 requires wMaxCommand to be "at least 256 decimal (0x100)" */
+#define WDM_DEFAULT_BUFSIZE     256
 
 static DEFINE_MUTEX(wdm_mutex);
 
@@ -88,7 +90,8 @@ struct wdm_device {
         int                     count;
         dma_addr_t              shandle;
         dma_addr_t              ihandle;
-        struct mutex            lock;
+        struct mutex            wlock;
+        struct mutex            rlock;
         wait_queue_head_t       wait;
         struct work_struct      rxwork;
         int                     werr;
@@ -323,7 +326,7 @@ static ssize_t wdm_write
         }
 
         /* concurrent writes and disconnect */
-        r = mutex_lock_interruptible(&desc->lock);
+        r = mutex_lock_interruptible(&desc->wlock);
         rv = -ERESTARTSYS;
         if (r) {
                 kfree(buf);
@@ -386,7 +389,7 @@ static ssize_t wdm_write
 out:
         usb_autopm_put_interface(desc->intf);
 outnp:
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
 outnl:
         return rv < 0 ? rv : count;
 }
@@ -399,7 +402,7 @@ static ssize_t wdm_read
         struct wdm_device *desc = file->private_data;
 
 
-        rv = mutex_lock_interruptible(&desc->lock); /*concurrent reads */
+        rv = mutex_lock_interruptible(&desc->rlock); /*concurrent reads */
         if (rv < 0)
                 return -ERESTARTSYS;
 
@@ -467,14 +470,16 @@ retry:
         for (i = 0; i < desc->length - cntr; i++)
                 desc->ubuf[i] = desc->ubuf[i + cntr];
 
+        spin_lock_irq(&desc->iuspin);
         desc->length -= cntr;
+        spin_unlock_irq(&desc->iuspin);
         /* in case we had outstanding data */
         if (!desc->length)
                 clear_bit(WDM_READ, &desc->flags);
         rv = cntr;
 
 err:
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->rlock);
         return rv;
 }
 
@@ -540,7 +545,8 @@ static int wdm_open(struct inode *inode, struct file *file)
         }
         intf->needs_remote_wakeup = 1;
 
-        mutex_lock(&desc->lock);
+        /* using write lock to protect desc->count */
+        mutex_lock(&desc->wlock);
         if (!desc->count++) {
                 desc->werr = 0;
                 desc->rerr = 0;
@@ -553,7 +559,7 @@ static int wdm_open(struct inode *inode, struct file *file)
         } else {
                 rv = 0;
         }
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
         usb_autopm_put_interface(desc->intf);
 out:
         mutex_unlock(&wdm_mutex);
@@ -565,9 +571,11 @@ static int wdm_release(struct inode *inode, struct file *file)
         struct wdm_device *desc = file->private_data;
 
         mutex_lock(&wdm_mutex);
-        mutex_lock(&desc->lock);
+
+        /* using write lock to protect desc->count */
+        mutex_lock(&desc->wlock);
         desc->count--;
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
 
         if (!desc->count) {
                 dev_dbg(&desc->intf->dev, "wdm_release: cleanup");
@@ -630,7 +638,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
         struct usb_cdc_dmm_desc *dmhd;
         u8 *buffer = intf->altsetting->extra;
         int buflen = intf->altsetting->extralen;
-        u16 maxcom = 0;
+        u16 maxcom = WDM_DEFAULT_BUFSIZE;
 
         if (!buffer)
                 goto out;
@@ -665,7 +673,8 @@ next_desc:
         desc = kzalloc(sizeof(struct wdm_device), GFP_KERNEL);
         if (!desc)
                 goto out;
-        mutex_init(&desc->lock);
+        mutex_init(&desc->rlock);
+        mutex_init(&desc->wlock);
         spin_lock_init(&desc->iuspin);
         init_waitqueue_head(&desc->wait);
         desc->wMaxCommand = maxcom;
@@ -716,7 +725,7 @@ next_desc:
                 goto err;
 
         desc->inbuf = usb_alloc_coherent(interface_to_usbdev(intf),
-                                         desc->bMaxPacketSize0,
+                                         desc->wMaxCommand,
                                          GFP_KERNEL,
                                          &desc->response->transfer_dma);
         if (!desc->inbuf)
@@ -779,11 +788,13 @@ static void wdm_disconnect(struct usb_interface *intf)
         /* to terminate pending flushes */
         clear_bit(WDM_IN_USE, &desc->flags);
         spin_unlock_irqrestore(&desc->iuspin, flags);
-        mutex_lock(&desc->lock);
+        wake_up_all(&desc->wait);
+        mutex_lock(&desc->rlock);
+        mutex_lock(&desc->wlock);
         kill_urbs(desc);
         cancel_work_sync(&desc->rxwork);
-        mutex_unlock(&desc->lock);
-        wake_up_all(&desc->wait);
+        mutex_unlock(&desc->wlock);
+        mutex_unlock(&desc->rlock);
         if (!desc->count)
                 cleanup(desc);
         mutex_unlock(&wdm_mutex);
@@ -798,8 +809,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
         dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor);
 
         /* if this is an autosuspend the caller does the locking */
-        if (!PMSG_IS_AUTO(message))
-                mutex_lock(&desc->lock);
+        if (!PMSG_IS_AUTO(message)) {
+                mutex_lock(&desc->rlock);
+                mutex_lock(&desc->wlock);
+        }
         spin_lock_irq(&desc->iuspin);
 
         if (PMSG_IS_AUTO(message) &&
@@ -815,8 +828,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
                 kill_urbs(desc);
                 cancel_work_sync(&desc->rxwork);
         }
-        if (!PMSG_IS_AUTO(message))
-                mutex_unlock(&desc->lock);
+        if (!PMSG_IS_AUTO(message)) {
+                mutex_unlock(&desc->wlock);
+                mutex_unlock(&desc->rlock);
+        }
 
         return rv;
 }
@@ -854,7 +869,8 @@ static int wdm_pre_reset(struct usb_interface *intf)
 {
         struct wdm_device *desc = usb_get_intfdata(intf);
 
-        mutex_lock(&desc->lock);
+        mutex_lock(&desc->rlock);
+        mutex_lock(&desc->wlock);
         kill_urbs(desc);
 
         /*
@@ -876,7 +892,8 @@ static int wdm_post_reset(struct usb_interface *intf)
         int rv;
 
         rv = recover_from_urb_loss(desc);
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
+        mutex_unlock(&desc->rlock);
         return 0;
 }
 
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 2f51de57593a..c8df1dd967ef 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -126,7 +126,6 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
                 struct dwc3_request *req)
 {
         struct dwc3             *dwc = dep->dwc;
-        u32                     type;
         int                     ret = 0;
 
         req->request.actual     = 0;
@@ -149,20 +148,14 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
 
                 direction = !!(dep->flags & DWC3_EP0_DIR_IN);
 
-                if (dwc->ep0state == EP0_STATUS_PHASE) {
-                        type = dwc->three_stage_setup
-                                ? DWC3_TRBCTL_CONTROL_STATUS3
-                                : DWC3_TRBCTL_CONTROL_STATUS2;
-                } else if (dwc->ep0state == EP0_DATA_PHASE) {
-                        type = DWC3_TRBCTL_CONTROL_DATA;
-                } else {
-                        /* should never happen */
-                        WARN_ON(1);
+                if (dwc->ep0state != EP0_DATA_PHASE) {
+                        dev_WARN(dwc->dev, "Unexpected pending request\n");
                         return 0;
                 }
 
                 ret = dwc3_ep0_start_trans(dwc, direction,
-                                req->request.dma, req->request.length, type);
+                                req->request.dma, req->request.length,
+                                DWC3_TRBCTL_CONTROL_DATA);
                 dep->flags &= ~(DWC3_EP_PENDING_REQUEST |
                                 DWC3_EP0_DIR_IN);
         } else if (dwc->delayed_status) {
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index a696bde53222..064b6e2cd411 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -101,7 +101,7 @@ void dwc3_unmap_buffer_from_dma(struct dwc3_request *req)
         if (req->request.num_mapped_sgs) {
                 req->request.dma = DMA_ADDR_INVALID;
                 dma_unmap_sg(dwc->dev, req->request.sg,
-                                req->request.num_sgs,
+                                req->request.num_mapped_sgs,
                                 req->direction ? DMA_TO_DEVICE
                                 : DMA_FROM_DEVICE);
 
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index a95de6a4a134..baaebf2830fc 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -175,13 +175,12 @@ ep_found:
         _ep->comp_desc = comp_desc;
         if (g->speed == USB_SPEED_SUPER) {
                 switch (usb_endpoint_type(_ep->desc)) {
-                case USB_ENDPOINT_XFER_BULK:
-                case USB_ENDPOINT_XFER_INT:
-                        _ep->maxburst = comp_desc->bMaxBurst;
-                        break;
                 case USB_ENDPOINT_XFER_ISOC:
                         /* mult: bits 1:0 of bmAttributes */
                         _ep->mult = comp_desc->bmAttributes & 0x3;
+                case USB_ENDPOINT_XFER_BULK:
+                case USB_ENDPOINT_XFER_INT:
+                        _ep->maxburst = comp_desc->bMaxBurst;
                         break;
                 default:
                         /* Do nothing for control endpoints */
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 753aa0683ac1..e0e6375ef5dd 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -126,7 +126,7 @@ ep_matches (
          * descriptor and see if the EP matches it
          */
         if (usb_endpoint_xfer_bulk(desc)) {
-                if (ep_comp) {
+                if (ep_comp && gadget->max_speed >= USB_SPEED_SUPER) {
                         num_req_streams = ep_comp->bmAttributes & 0x1f;
                         if (num_req_streams > ep->max_streams)
                                 return 0;
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 6353eca1e852..ee8ceec01560 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -3123,15 +3123,15 @@ fsg_add(struct usb_composite_dev *cdev, struct usb_configuration *c,
 
 struct fsg_module_parameters {
         char            *file[FSG_MAX_LUNS];
-        int             ro[FSG_MAX_LUNS];
-        int             removable[FSG_MAX_LUNS];
-        int             cdrom[FSG_MAX_LUNS];
-        int             nofua[FSG_MAX_LUNS];
+        bool            ro[FSG_MAX_LUNS];
+        bool            removable[FSG_MAX_LUNS];
+        bool            cdrom[FSG_MAX_LUNS];
+        bool            nofua[FSG_MAX_LUNS];
 
         unsigned int    file_count, ro_count, removable_count, cdrom_count;
         unsigned int    nofua_count;
         unsigned int    luns;   /* nluns */
-        int             stall;  /* can_stall */
+        bool            stall;  /* can_stall */
 };
 
 #define _FSG_MODULE_PARAM_ARRAY(prefix, params, name, type, desc)       \
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index d7ea6c076ce9..b04712f19f1e 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1430,7 +1430,7 @@ static void setup_received_irq(struct fsl_udc *udc,
                         int pipe = get_pipe_by_windex(wIndex);
                         struct fsl_ep *ep;
 
-                        if (wValue != 0 || wLength != 0 || pipe > udc->max_ep)
+                        if (wValue != 0 || wLength != 0 || pipe >= udc->max_ep)
                                 break;
                         ep = get_ep_by_pipe(udc, pipe);
 
@@ -1673,7 +1673,7 @@ static void dtd_complete_irq(struct fsl_udc *udc)
         if (!bit_pos)
                 return;
 
-        for (i = 0; i < udc->max_ep * 2; i++) {
+        for (i = 0; i < udc->max_ep; i++) {
                 ep_num = i >> 1;
                 direction = i % 2;
 
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index fa0fcc11263f..e2293c1588ee 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -11,11 +11,6 @@
 /* #undef       DEBUG */
 /* #undef       VERBOSE_DEBUG */
 
-#if defined(CONFIG_USB_LANGWELL_OTG)
-#define OTG_TRANSCEIVER
-#endif
-
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -1522,8 +1517,7 @@ static void langwell_udc_stop(struct langwell_udc *dev)
 
 
 /* stop all USB activities */
-static void stop_activity(struct langwell_udc *dev,
-                struct usb_gadget_driver *driver)
+static void stop_activity(struct langwell_udc *dev)
 {
         struct langwell_ep      *ep;
         dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__);
@@ -1535,9 +1529,9 @@ static void stop_activity(struct langwell_udc *dev,
         }
 
         /* report disconnect; the driver is already quiesced */
-        if (driver) {
+        if (dev->driver) {
                 spin_unlock(&dev->lock);
-                driver->disconnect(&dev->gadget);
+                dev->driver->disconnect(&dev->gadget);
                 spin_lock(&dev->lock);
         }
 
@@ -1925,11 +1919,10 @@ static int langwell_stop(struct usb_gadget *g,
 
         /* stop all usb activities */
         dev->gadget.speed = USB_SPEED_UNKNOWN;
-        stop_activity(dev, driver);
-        spin_unlock_irqrestore(&dev->lock, flags);
-
         dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
+        stop_activity(dev);
+        spin_unlock_irqrestore(&dev->lock, flags);
 
         device_remove_file(&dev->pdev->dev, &dev_attr_function);
 
@@ -2315,13 +2308,9 @@ static void handle_setup_packet(struct langwell_udc *dev,
 
                         if (!gadget_is_otg(&dev->gadget))
                                 break;
-                        else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) {
+                        else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE)
                                 dev->gadget.b_hnp_enable = 1;
-#ifdef  OTG_TRANSCEIVER
-                                if (!dev->lotg->otg.default_a)
-                                        dev->lotg->hsm.b_hnp_enable = 1;
-#endif
-                        } else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT)
+                        else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT)
                                 dev->gadget.a_hnp_support = 1;
                         else if (setup->bRequest ==
                                         USB_DEVICE_A_ALT_HNP_SUPPORT)
@@ -2733,7 +2722,7 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 dev->bus_reset = 1;
 
                 /* reset all the queues, stop all USB activities */
-                stop_activity(dev, dev->driver);
+                stop_activity(dev);
                 dev->usb_state = USB_STATE_DEFAULT;
         } else {
                 dev_vdbg(&dev->pdev->dev, "device controller reset\n");
@@ -2741,7 +2730,7 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 langwell_udc_reset(dev);
 
                 /* reset all the queues, stop all USB activities */
-                stop_activity(dev, dev->driver);
+                stop_activity(dev);
 
                 /* reset ep0 dQH and endptctrl */
                 ep0_reset(dev);
@@ -2752,12 +2741,6 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 dev->usb_state = USB_STATE_ATTACHED;
         }
 
-#ifdef  OTG_TRANSCEIVER
-        /* refer to USB OTG 6.6.2.3 b_hnp_en is cleared */
-        if (!dev->lotg->otg.default_a)
-                dev->lotg->hsm.b_hnp_enable = 0;
-#endif
-
         dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 }
 
@@ -2770,29 +2753,6 @@ static void handle_bus_suspend(struct langwell_udc *dev)
         dev->resume_state = dev->usb_state;
         dev->usb_state = USB_STATE_SUSPENDED;
 
-#ifdef  OTG_TRANSCEIVER
-        if (dev->lotg->otg.default_a) {
-                if (dev->lotg->hsm.b_bus_suspend_vld == 1) {
-                        dev->lotg->hsm.b_bus_suspend = 1;
-                        /* notify transceiver the state changes */
-                        if (spin_trylock(&dev->lotg->wq_lock)) {
-                                langwell_update_transceiver();
-                                spin_unlock(&dev->lotg->wq_lock);
-                        }
-                }
-                dev->lotg->hsm.b_bus_suspend_vld++;
-        } else {
-                if (!dev->lotg->hsm.a_bus_suspend) {
-                        dev->lotg->hsm.a_bus_suspend = 1;
-                        /* notify transceiver the state changes */
-                        if (spin_trylock(&dev->lotg->wq_lock)) {
-                                langwell_update_transceiver();
-                                spin_unlock(&dev->lotg->wq_lock);
-                        }
-                }
-        }
-#endif
-
         /* report suspend to the driver */
         if (dev->driver) {
                 if (dev->driver->suspend) {
@@ -2823,11 +2783,6 @@ static void handle_bus_resume(struct langwell_udc *dev)
         if (dev->pdev->device != 0x0829)
                 langwell_phy_low_power(dev, 0);
 
-#ifdef  OTG_TRANSCEIVER
-        if (dev->lotg->otg.default_a == 0)
-                dev->lotg->hsm.a_bus_suspend = 0;
-#endif
-
         /* report resume to the driver */
         if (dev->driver) {
                 if (dev->driver->resume) {
@@ -3020,7 +2975,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
 
         dev->done = &done;
 
-#ifndef OTG_TRANSCEIVER
         /* free dTD dma_pool and dQH */
         if (dev->dtd_pool)
                 dma_pool_destroy(dev->dtd_pool);
@@ -3032,7 +2986,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         /* release SRAM caching */
         if (dev->has_sram && dev->got_sram)
                 sram_deinit(dev);
-#endif
 
         if (dev->status_req) {
                 kfree(dev->status_req->req.buf);
@@ -3045,7 +2998,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         if (dev->got_irq)
                 free_irq(pdev->irq, dev);
 
-#ifndef OTG_TRANSCEIVER
         if (dev->cap_regs)
                 iounmap(dev->cap_regs);
 
@@ -3055,13 +3007,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
 
         if (dev->enabled)
                 pci_disable_device(pdev);
-#else
-        if (dev->transceiver) {
-                otg_put_transceiver(dev->transceiver);
-                dev->transceiver = NULL;
-                dev->lotg = NULL;
-        }
-#endif
 
         dev->cap_regs = NULL;
 
@@ -3072,9 +3017,7 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         device_remove_file(&pdev->dev, &dev_attr_langwell_udc);
         device_remove_file(&pdev->dev, &dev_attr_remote_wakeup);
 
-#ifndef OTG_TRANSCEIVER
         pci_set_drvdata(pdev, NULL);
-#endif
 
         /* free dev, wait for the release() finished */
         wait_for_completion(&done);
@@ -3089,9 +3032,7 @@ static int langwell_udc_probe(struct pci_dev *pdev,
                 const struct pci_device_id *id)
 {
         struct langwell_udc     *dev;
-#ifndef OTG_TRANSCEIVER
         unsigned long           resource, len;
-#endif
         void                    __iomem *base = NULL;
         size_t                  size;
         int                     retval;
@@ -3109,16 +3050,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->pdev = pdev;
         dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__);
 
-#ifdef  OTG_TRANSCEIVER
-        /* PCI device is already enabled by otg_transceiver driver */
-        dev->enabled = 1;
-
-        /* mem region and register base */
-        dev->region = 1;
-        dev->transceiver = otg_get_transceiver();
-        dev->lotg = otg_to_langwell(dev->transceiver);
-        base = dev->lotg->regs;
-#else
         pci_set_drvdata(pdev, dev);
 
         /* now all the pci goodies ... */
@@ -3139,7 +3070,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->region = 1;
 
         base = ioremap_nocache(resource, len);
-#endif
         if (base == NULL) {
                 dev_err(&dev->pdev->dev, "can't map memory\n");
                 retval = -EFAULT;
@@ -3163,7 +3093,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->got_sram = 0;
         dev_vdbg(&dev->pdev->dev, "dev->has_sram: %d\n", dev->has_sram);
 
-#ifndef OTG_TRANSCEIVER
         /* enable SRAM caching if detected */
         if (dev->has_sram && !dev->got_sram)
                 sram_init(dev);
@@ -3182,7 +3111,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
                 goto error;
         }
         dev->got_irq = 1;
-#endif
 
         /* set stopped bit */
         dev->stopped = 1;
@@ -3257,10 +3185,8 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->remote_wakeup = 0;
         dev->dev_status = 1 << USB_DEVICE_SELF_POWERED;
 
-#ifndef OTG_TRANSCEIVER
         /* reset device controller */
         langwell_udc_reset(dev);
-#endif
 
         /* initialize gadget structure */
         dev->gadget.ops = &langwell_ops;        /* usb_gadget_ops */
@@ -3268,9 +3194,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         INIT_LIST_HEAD(&dev->gadget.ep_list);   /* ep_list */
         dev->gadget.speed = USB_SPEED_UNKNOWN;  /* speed */
         dev->gadget.max_speed = USB_SPEED_HIGH; /* support dual speed */
-#ifdef  OTG_TRANSCEIVER
-        dev->gadget.is_otg = 1;                 /* support otg mode */
-#endif
 
         /* the "gadget" abstracts/virtualizes the controller */
         dev_set_name(&dev->gadget.dev, "gadget");
@@ -3282,10 +3205,8 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         /* controller endpoints reinit */
         eps_reinit(dev);
 
-#ifndef OTG_TRANSCEIVER
         /* reset ep0 dQH and endptctrl */
         ep0_reset(dev);
-#endif
 
         /* create dTD dma_pool resource */
         dev->dtd_pool = dma_pool_create("langwell_dtd",
@@ -3367,7 +3288,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state)
 
         spin_lock_irq(&dev->lock);
         /* stop all usb activities */
-        stop_activity(dev, dev->driver);
+        stop_activity(dev);
         spin_unlock_irq(&dev->lock);
 
         /* free dTD dma_pool and dQH */
@@ -3525,22 +3446,14 @@ static struct pci_driver langwell_pci_driver = {
 
 static int __init init(void)
 {
-#ifdef  OTG_TRANSCEIVER
-        return langwell_register_peripheral(&langwell_pci_driver);
-#else
         return pci_register_driver(&langwell_pci_driver);
-#endif
 }
 module_init(init);
 
 
 static void __exit cleanup(void)
 {
-#ifdef  OTG_TRANSCEIVER
-        return langwell_unregister_peripheral(&langwell_pci_driver);
-#else
         pci_unregister_driver(&langwell_pci_driver);
-#endif
 }
 module_exit(cleanup);
 
diff --git a/drivers/usb/gadget/langwell_udc.h b/drivers/usb/gadget/langwell_udc.h
index ef79e242b7b0..d6e78accaffe 100644
--- a/drivers/usb/gadget/langwell_udc.h
+++ b/drivers/usb/gadget/langwell_udc.h
@@ -8,7 +8,6 @@
  */
 
 #include <linux/usb/langwell_udc.h>
-#include <linux/usb/langwell_otg.h>
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index c7f291a331df..85ea14e2545e 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -598,16 +598,16 @@ static __maybe_unused struct usb_ss_cap_descriptor fsg_ss_cap_desc = {
                 | USB_5GBPS_OPERATION),
         .bFunctionalitySupport = USB_LOW_SPEED_OPERATION,
         .bU1devExitLat =        USB_DEFAULT_U1_DEV_EXIT_LAT,
-        .bU2DevExitLat =        USB_DEFAULT_U2_DEV_EXIT_LAT,
+        .bU2DevExitLat =        cpu_to_le16(USB_DEFAULT_U2_DEV_EXIT_LAT),
 };
 
 static __maybe_unused struct usb_bos_descriptor fsg_bos_desc = {
         .bLength =              USB_DT_BOS_SIZE,
         .bDescriptorType =      USB_DT_BOS,
 
-        .wTotalLength =         USB_DT_BOS_SIZE
+        .wTotalLength =         cpu_to_le16(USB_DT_BOS_SIZE
                                 + USB_DT_USB_EXT_CAP_SIZE
-                                + USB_DT_USB_SS_CAP_SIZE,
+                                + USB_DT_USB_SS_CAP_SIZE),
 
         .bNumDeviceCaps =       2,
 };
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index e90344a17631..b556a72264d1 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -125,7 +125,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
          */
         if (pdata->init && pdata->init(pdev)) {
                 retval = -ENODEV;
-                goto err3;
+                goto err4;
         }
 
         /* Enable USB controller, 83xx or 8536 */
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index f4b627d343ac..01bb7241d6ef 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -276,6 +276,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 
         /* Serial Bus Release Number is at PCI 0x60 offset */
         pci_read_config_byte(pdev, 0x60, &ehci->sbrn);
+        if (pdev->vendor == PCI_VENDOR_ID_STMICRO
+            && pdev->device == PCI_DEVICE_ID_STMICRO_USB_HOST)
+                ehci->sbrn = 0x20; /* ConneXT has no sbrn register */
 
         /* Keep this around for a while just in case some EHCI
          * implementation uses legacy PCI PM support.  This test
@@ -526,6 +529,9 @@ static const struct pci_device_id pci_ids [] = { {
         /* handle any USB 2.0 EHCI controller */
         PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
         .driver_data =  (unsigned long) &ehci_pci_hc_driver,
+        }, {
+        PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST),
+        .driver_data = (unsigned long) &ehci_pci_hc_driver,
         },
         { /* end: all zeroes */ }
 };
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 5179fcd73d8a..e4bcb62b930a 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -82,6 +82,14 @@ urb_print(struct urb * urb, char * str, int small, int status)
                 ohci_dbg(ohci,format, ## arg ); \
         } while (0);
 
+/* Version for use where "next" is the address of a local variable */
+#define ohci_dbg_nosw(ohci, next, size, format, arg...) \
+        do { \
+                unsigned s_len; \
+                s_len = scnprintf(*next, *size, format, ## arg); \
+                *size -= s_len; *next += s_len; \
+        } while (0);
+
 
 static void ohci_dump_intr_mask (
         struct ohci_hcd *ohci,
@@ -653,7 +661,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
 
         /* dump driver info, then registers in spec order */
 
-        ohci_dbg_sw (ohci, &next, &size,
+        ohci_dbg_nosw(ohci, &next, &size,
                 "bus %s, device %s\n"
                 "%s\n"
                 "%s\n",
@@ -672,7 +680,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
 
         /* hcca */
         if (ohci->hcca)
-                ohci_dbg_sw (ohci, &next, &size,
+                ohci_dbg_nosw(ohci, &next, &size,
                         "hcca frame 0x%04x\n", ohci_frame_no(ohci));
 
         /* other registers mostly affect frame timings */
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 6109810cc2d3..1843bb68ac7c 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -397,6 +397,10 @@ static const struct pci_device_id pci_ids [] = { {
         /* handle any USB OHCI controller */
         PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
         .driver_data =  (unsigned long) &ohci_pci_hc_driver,
+        }, {
+        /* The device in the ConneXT I/O hub has no class reg */
+        PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_OHCI),
+        .driver_data =  (unsigned long) &ohci_pci_hc_driver,
         }, { /* end: all zeroes */ }
 };
 MODULE_DEVICE_TABLE (pci, pci_ids);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index b90e1386418b..b62037bff688 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1204,6 +1204,7 @@ static void handle_vendor_event(struct xhci_hcd *xhci,
  *
  * Returns a zero-based port number, which is suitable for indexing into each of
  * the split roothubs' port arrays and bus state arrays.
+ * Add one to it in order to call xhci_find_slot_id_by_port.
  */
 static unsigned int find_faked_portnum_from_hw_portnum(struct usb_hcd *hcd,
                 struct xhci_hcd *xhci, u32 port_id)
@@ -1324,7 +1325,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                         xhci_set_link_state(xhci, port_array, faked_port_index,
                                                 XDEV_U0);
                         slot_id = xhci_find_slot_id_by_port(hcd, xhci,
-                                        faked_port_index);
+                                        faked_port_index + 1);
                         if (!slot_id) {
                                 xhci_dbg(xhci, "slot_id is zero\n");
                                 goto cleanup;
@@ -3323,7 +3324,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 /* Check TD length */
                 if (running_total != td_len) {
                         xhci_err(xhci, "ISOC TD length unmatch\n");
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto cleanup;
                 }
         }
 
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index d9b6a0355443..da97dcec1f32 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -37,9 +37,6 @@ static int emi26_set_reset(struct usb_device *dev, unsigned char reset_bit);
 static int emi26_load_firmware (struct usb_device *dev);
 static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *id);
 static void emi26_disconnect(struct usb_interface *intf);
-static int __init emi26_init (void);
-static void __exit emi26_exit (void);
-
 
 /* thanks to drivers/usb/serial/keyspan_pda.c code */
 static int emi26_writememory (struct usb_device *dev, int address,
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 9f39062ebb08..4e0f167a6c4e 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -46,9 +46,6 @@ static int emi62_set_reset(struct usb_device *dev, unsigned char reset_bit);
 static int emi62_load_firmware (struct usb_device *dev);
 static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *id);
 static void emi62_disconnect(struct usb_interface *intf);
-static int __init emi62_init (void);
-static void __exit emi62_exit (void);
-
 
 /* thanks to drivers/usb/serial/keyspan_pda.c code */
 static int emi62_writememory(struct usb_device *dev, int address,
diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c
index 107bf13b1cf1..b2d82b937392 100644
--- a/drivers/usb/misc/usbsevseg.c
+++ b/drivers/usb/misc/usbsevseg.c
@@ -24,7 +24,7 @@
 
 #define VENDOR_ID       0x0fc5
 #define PRODUCT_ID      0x1227
-#define MAXLEN          6
+#define MAXLEN          8
 
 /* table of devices that work with this driver */
 static const struct usb_device_id id_table[] = {
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index f9a3f62a83b5..7c569f51212a 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -33,9 +33,6 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <mach/hardware.h>
-#include <mach/memory.h>
-#include <asm/gpio.h>
 #include <mach/cputype.h>
 
 #include <asm/mach-types.h>
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 56cf0243979e..3d11cf64ebd1 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -981,6 +981,9 @@ static void musb_shutdown(struct platform_device *pdev)
         unsigned long   flags;
 
         pm_runtime_get_sync(musb->controller);
+
+        musb_gadget_cleanup(musb);
+
         spin_lock_irqsave(&musb->lock, flags);
         musb_platform_disable(musb);
         musb_generic_disable(musb);
@@ -1827,8 +1830,6 @@ static void musb_free(struct musb *musb)
         sysfs_remove_group(&musb->controller->kobj, &musb_attr_group);
 #endif
 
-        musb_gadget_cleanup(musb);
-
         if (musb->nIrq >= 0) {
                 if (musb->irq_wake)
                         disable_irq_wake(musb->nIrq);
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index c27bbbf32b52..df719eae3b03 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -222,7 +222,6 @@ static inline void omap2430_low_level_init(struct musb *musb)
         musb_writel(musb->mregs, OTG_FORCESTDBY, l);
 }
 
-/* blocking notifier support */
 static int musb_otg_notifications(struct notifier_block *nb,
                 unsigned long event, void *unused)
 {
@@ -231,7 +230,7 @@ static int musb_otg_notifications(struct notifier_block *nb,
         musb->xceiv_event = event;
         schedule_work(&musb->otg_notifier_work);
 
-        return 0;
+        return NOTIFY_OK;
 }
 
 static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
@@ -386,6 +385,7 @@ static void omap2430_musb_disable(struct musb *musb)
 static int omap2430_musb_exit(struct musb *musb)
 {
         del_timer_sync(&musb_idle_timer);
+        cancel_work_sync(&musb->otg_notifier_work);
 
         omap2430_low_level_exit(musb);
         otg_put_transceiver(musb->xceiv);
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 2a25955881fc..76d629345418 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -86,20 +86,6 @@ config NOP_USB_XCEIV
           built-in with usb ip or which are autonomous and doesn't require any
           phy programming such as ISP1x04 etc.
 
-config USB_LANGWELL_OTG
-        tristate "Intel Langwell USB OTG dual-role support"
-        depends on USB && PCI && INTEL_SCU_IPC
-        select USB_OTG
-        select USB_OTG_UTILS
-        help
-          Say Y here if you want to build Intel Langwell USB OTG
-          transciever driver in kernel. This driver implements role
-          switch between EHCI host driver and Langwell USB OTG
-          client driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called langwell_otg.
-
 config USB_MSM_OTG
         tristate "OTG support for Qualcomm on-chip USB controller"
         depends on (USB || USB_GADGET) && ARCH_MSM
@@ -124,7 +110,7 @@ config AB8500_USB
 
 config FSL_USB2_OTG
         bool "Freescale USB OTG Transceiver Driver"
-        depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2
+        depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2 && USB_SUSPEND
         select USB_OTG
         select USB_OTG_UTILS
         help
@@ -132,7 +118,7 @@ config FSL_USB2_OTG
 
 config USB_MV_OTG
         tristate "Marvell USB OTG support"
-        depends on USB_MV_UDC
+        depends on USB_MV_UDC && USB_SUSPEND
         select USB_OTG
         select USB_OTG_UTILS
         help
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
index b2c5a9598637..41aa5098b139 100644
--- a/drivers/usb/otg/Makefile
+++ b/drivers/usb/otg/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_USB_GPIO_VBUS)	+= gpio_vbus.o
 obj-$(CONFIG_ISP1301_OMAP)      += isp1301_omap.o
 obj-$(CONFIG_TWL4030_USB)       += twl4030-usb.o
 obj-$(CONFIG_TWL6030_USB)       += twl6030-usb.o
-obj-$(CONFIG_USB_LANGWELL_OTG)  += langwell_otg.o
 obj-$(CONFIG_NOP_USB_XCEIV)     += nop-usb-xceiv.o
 obj-$(CONFIG_USB_ULPI)          += ulpi.o
 obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o
diff --git a/drivers/usb/otg/langwell_otg.c b/drivers/usb/otg/langwell_otg.c
deleted file mode 100644
index f08f784086f7..000000000000
--- a/drivers/usb/otg/langwell_otg.c
+++ /dev/null
@@ -1,2347 +0,0 @@
-/*
- * Intel Langwell USB OTG transceiver driver
- * Copyright (C) 2008 - 2010, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-/* This driver helps to switch Langwell OTG controller function between host
- * and peripheral. It works with EHCI driver and Langwell client controller
- * driver together.
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
-#include <linux/moduleparam.h>
-#include <linux/usb/ch9.h>
-#include <linux/usb/gadget.h>
-#include <linux/usb.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/hcd.h>
-#include <linux/notifier.h>
-#include <linux/delay.h>
-#include <asm/intel_scu_ipc.h>
-
-#include <linux/usb/langwell_otg.h>
-
-#define DRIVER_DESC             "Intel Langwell USB OTG transceiver driver"
-#define DRIVER_VERSION          "July 10, 2010"
-
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_AUTHOR("Henry Yuan <hang.yuan@intel.com>, Hao Wu <hao.wu@intel.com>");
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");
-
-static const char driver_name[] = "langwell_otg";
-
-static int langwell_otg_probe(struct pci_dev *pdev,
-                        const struct pci_device_id *id);
-static void langwell_otg_remove(struct pci_dev *pdev);
-static int langwell_otg_suspend(struct pci_dev *pdev, pm_message_t message);
-static int langwell_otg_resume(struct pci_dev *pdev);
-
-static int langwell_otg_set_host(struct otg_transceiver *otg,
-                                struct usb_bus *host);
-static int langwell_otg_set_peripheral(struct otg_transceiver *otg,
-                                struct usb_gadget *gadget);
-static int langwell_otg_start_srp(struct otg_transceiver *otg);
-
-static const struct pci_device_id pci_ids[] = {{
-        .class =        ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
-        .class_mask =   ~0,
-        .vendor =       0x8086,
-        .device =       0x0811,
-        .subvendor =    PCI_ANY_ID,
-        .subdevice =    PCI_ANY_ID,
-}, { /* end: all zeroes */ }
-};
-
-static struct pci_driver otg_pci_driver = {
-        .name =         (char *) driver_name,
-        .id_table =     pci_ids,
-
-        .probe =        langwell_otg_probe,
-        .remove =       langwell_otg_remove,
-
-        .suspend =      langwell_otg_suspend,
-        .resume =       langwell_otg_resume,
-};
-
-/* HSM timers */
-static inline struct langwell_otg_timer *otg_timer_initializer
-(void (*function)(unsigned long), unsigned long expires, unsigned long data)
-{
-        struct langwell_otg_timer *timer;
-        timer = kmalloc(sizeof(struct langwell_otg_timer), GFP_KERNEL);
-        if (timer == NULL)
-                return timer;
-
-        timer->function = function;
-        timer->expires = expires;
-        timer->data = data;
-        return timer;
-}
-
-static struct langwell_otg_timer *a_wait_vrise_tmr, *a_aidl_bdis_tmr,
-        *b_se0_srp_tmr, *b_srp_init_tmr;
-
-static struct list_head active_timers;
-
-static struct langwell_otg *the_transceiver;
-
-/* host/client notify transceiver when event affects HNP state */
-void langwell_update_transceiver(void)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        dev_dbg(lnw->dev, "transceiver is updated\n");
-
-        if (!lnw->qwork)
-                return ;
-
-        queue_work(lnw->qwork, &lnw->work);
-}
-EXPORT_SYMBOL(langwell_update_transceiver);
-
-static int langwell_otg_set_host(struct otg_transceiver *otg,
-                                        struct usb_bus *host)
-{
-        otg->host = host;
-
-        return 0;
-}
-
-static int langwell_otg_set_peripheral(struct otg_transceiver *otg,
-                                        struct usb_gadget *gadget)
-{
-        otg->gadget = gadget;
-
-        return 0;
-}
-
-static int langwell_otg_set_power(struct otg_transceiver *otg,
-                                unsigned mA)
-{
-        return 0;
-}
-
-/* A-device drives vbus, controlled through IPC commands */
-static int langwell_otg_set_vbus(struct otg_transceiver *otg, bool enabled)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        u8                              sub_id;
-
-        dev_dbg(lnw->dev, "%s <--- %s\n", __func__, enabled ? "on" : "off");
-
-        if (enabled)
-                sub_id = 0x8; /* Turn on the VBus */
-        else
-                sub_id = 0x9; /* Turn off the VBus */
-
-        if (intel_scu_ipc_simple_command(0xef, sub_id)) {
-                dev_dbg(lnw->dev, "Failed to set Vbus via IPC commands\n");
-                return -EBUSY;
-        }
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        return 0;
-}
-
-/* charge vbus or discharge vbus through a resistor to ground */
-static void langwell_otg_chrg_vbus(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32     val;
-
-        val = readl(lnw->iotg.base + CI_OTGSC);
-
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_VC,
-                                lnw->iotg.base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_VD,
-                                lnw->iotg.base + CI_OTGSC);
-}
-
-/* Start SRP */
-static int langwell_otg_start_srp(struct otg_transceiver *otg)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        val = readl(iotg->base + CI_OTGSC);
-
-        writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HADP,
-                                iotg->base + CI_OTGSC);
-
-        /* Check if the data plus is finished or not */
-        msleep(8);
-        val = readl(iotg->base + CI_OTGSC);
-        if (val & (OTGSC_HADP | OTGSC_DP))
-                dev_dbg(lnw->dev, "DataLine SRP Error\n");
-
-        /* Disable interrupt - b_sess_vld */
-        val = readl(iotg->base + CI_OTGSC);
-        val &= (~(OTGSC_BSVIE | OTGSC_BSEIE));
-        writel(val, iotg->base + CI_OTGSC);
-
-        /* Start VBus SRP, drive vbus to generate VBus pulse */
-        iotg->otg.set_vbus(&iotg->otg, true);
-        msleep(15);
-        iotg->otg.set_vbus(&iotg->otg, false);
-
-        /* Enable interrupt - b_sess_vld*/
-        val = readl(iotg->base + CI_OTGSC);
-        dev_dbg(lnw->dev, "after VBUS pulse otgsc = %x\n", val);
-
-        val |= (OTGSC_BSVIE | OTGSC_BSEIE);
-        writel(val, iotg->base + CI_OTGSC);
-
-        /* If Vbus is valid, then update the hsm */
-        if (val & OTGSC_BSV) {
-                dev_dbg(lnw->dev, "no b_sess_vld interrupt\n");
-
-                lnw->iotg.hsm.b_sess_vld = 1;
-                langwell_update_transceiver();
-        }
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-        return 0;
-}
-
-/* stop SOF via bus_suspend */
-static void langwell_otg_loc_sof(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        struct usb_hcd          *hcd;
-        int                     err;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "suspend" : "resume");
-
-        hcd = bus_to_hcd(lnw->iotg.otg.host);
-        if (on)
-                err = hcd->driver->bus_resume(hcd);
-        else
-                err = hcd->driver->bus_suspend(hcd);
-
-        if (err)
-                dev_dbg(lnw->dev, "Fail to resume/suspend USB bus - %d\n", err);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-static int langwell_otg_check_otgsc(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        u32                             otgsc, usbcfg;
-
-        dev_dbg(lnw->dev, "check sync OTGSC and USBCFG registers\n");
-
-        otgsc = readl(lnw->iotg.base + CI_OTGSC);
-        usbcfg = readl(lnw->usbcfg);
-
-        dev_dbg(lnw->dev, "OTGSC = %08x, USBCFG = %08x\n",
-                                        otgsc, usbcfg);
-        dev_dbg(lnw->dev, "OTGSC_AVV = %d\n", !!(otgsc & OTGSC_AVV));
-        dev_dbg(lnw->dev, "USBCFG.VBUSVAL = %d\n",
-                                        !!(usbcfg & USBCFG_VBUSVAL));
-        dev_dbg(lnw->dev, "OTGSC_ASV = %d\n", !!(otgsc & OTGSC_ASV));
-        dev_dbg(lnw->dev, "USBCFG.AVALID = %d\n",
-                                        !!(usbcfg & USBCFG_AVALID));
-        dev_dbg(lnw->dev, "OTGSC_BSV = %d\n", !!(otgsc & OTGSC_BSV));
-        dev_dbg(lnw->dev, "USBCFG.BVALID = %d\n",
-                                        !!(usbcfg & USBCFG_BVALID));
-        dev_dbg(lnw->dev, "OTGSC_BSE = %d\n", !!(otgsc & OTGSC_BSE));
-        dev_dbg(lnw->dev, "USBCFG.SESEND = %d\n",
-                                        !!(usbcfg & USBCFG_SESEND));
-
-        /* Check USBCFG VBusValid/AValid/BValid/SessEnd */
-        if (!!(otgsc & OTGSC_AVV) ^ !!(usbcfg & USBCFG_VBUSVAL)) {
-                dev_dbg(lnw->dev, "OTGSC.AVV != USBCFG.VBUSVAL\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_ASV) ^ !!(usbcfg & USBCFG_AVALID)) {
-                dev_dbg(lnw->dev, "OTGSC.ASV != USBCFG.AVALID\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_BSV) ^ !!(usbcfg & USBCFG_BVALID)) {
-                dev_dbg(lnw->dev, "OTGSC.BSV != USBCFG.BVALID\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_BSE) ^ !!(usbcfg & USBCFG_SESEND)) {
-                dev_dbg(lnw->dev, "OTGSC.BSE != USBCFG.SESSEN\n");
-                goto err;
-        }
-
-        dev_dbg(lnw->dev, "OTGSC and USBCFG are synced\n");
-
-        return 0;
-
-err:
-        dev_warn(lnw->dev, "OTGSC isn't equal to USBCFG\n");
-        return -EPIPE;
-}
-
-
-static void langwell_otg_phy_low_power(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u8                              val, phcd;
-        int                             retval;
-
-        dev_dbg(lnw->dev, "%s ---> %s mode\n",
-                        __func__, on ? "Low power" : "Normal");
-
-        phcd = 0x40;
-
-        val = readb(iotg->base + CI_HOSTPC1 + 2);
-
-        if (on) {
-                /* Due to hardware issue, after set PHCD, sync will failed
-                 * between USBCFG and OTGSC, so before set PHCD, check if
-                 * sync is in process now. If the answer is "yes", then do
-                 * not touch PHCD bit */
-                retval = langwell_otg_check_otgsc();
-                if (retval) {
-                        dev_dbg(lnw->dev, "Skip PHCD programming..\n");
-                        return ;
-                }
-
-                writeb(val | phcd, iotg->base + CI_HOSTPC1 + 2);
-        } else
-                writeb(val & ~phcd, iotg->base + CI_HOSTPC1 + 2);
-
-        dev_dbg(lnw->dev, "%s <--- done\n", __func__);
-}
-
-/* After drv vbus, add 5 ms delay to set PHCD */
-static void langwell_otg_phy_low_power_wait(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-
-        dev_dbg(lnw->dev, "add 5ms delay before programing PHCD\n");
-
-        mdelay(5);
-        langwell_otg_phy_low_power(on);
-}
-
-/* Enable/Disable OTG interrupt */
-static void langwell_otg_intr(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-
-        /* OTGSC_INT_MASK doesn't contains 1msInt */
-        if (on) {
-                val = val | (OTGSC_INT_MASK);
-                writel(val, iotg->base + CI_OTGSC);
-        } else {
-                val = val & ~(OTGSC_INT_MASK);
-                writel(val, iotg->base + CI_OTGSC);
-        }
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-/* set HAAR: Hardware Assist Auto-Reset */
-static void langwell_otg_HAAR(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HAAR,
-                                        iotg->base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) & ~OTGSC_HAAR,
-                                        iotg->base + CI_OTGSC);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-/* set HABA: Hardware Assist B-Disconnect to A-Connect */
-static void langwell_otg_HABA(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HABA,
-                                        iotg->base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) & ~OTGSC_HABA,
-                                        iotg->base + CI_OTGSC);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-static int langwell_otg_check_se0_srp(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     delay_time = TB_SE0_SRP * 10;
-        u32                     val;
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        do {
-                udelay(100);
-                if (!delay_time--)
-                        break;
-                val = readl(lnw->iotg.base + CI_PORTSC1);
-                val &= PORTSC_LS;
-        } while (!val);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-        return val;
-}
-
-/* The timeout callback function to set time out bit */
-static void set_tmout(unsigned long indicator)
-{
-        *(int *)indicator = 1;
-}
-
-void langwell_otg_nsf_msg(unsigned long indicator)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-
-        switch (indicator) {
-        case 2:
-        case 4:
-        case 6:
-        case 7:
-                dev_warn(lnw->dev,
-                        "OTG:NSF-%lu - deivce not responding\n", indicator);
-                break;
-        case 3:
-                dev_warn(lnw->dev,
-                        "OTG:NSF-%lu - deivce not supported\n", indicator);
-                break;
-        default:
-                dev_warn(lnw->dev, "Do not have this kind of NSF\n");
-                break;
-        }
-}
-
-/* Initialize timers */
-static int langwell_otg_init_timers(struct otg_hsm *hsm)
-{
-        /* HSM used timers */
-        a_wait_vrise_tmr = otg_timer_initializer(&set_tmout, TA_WAIT_VRISE,
-                                (unsigned long)&hsm->a_wait_vrise_tmout);
-        if (a_wait_vrise_tmr == NULL)
-                return -ENOMEM;
-        a_aidl_bdis_tmr = otg_timer_initializer(&set_tmout, TA_AIDL_BDIS,
-                                (unsigned long)&hsm->a_aidl_bdis_tmout);
-        if (a_aidl_bdis_tmr == NULL)
-                return -ENOMEM;
-        b_se0_srp_tmr = otg_timer_initializer(&set_tmout, TB_SE0_SRP,
-                                (unsigned long)&hsm->b_se0_srp);
-        if (b_se0_srp_tmr == NULL)
-                return -ENOMEM;
-        b_srp_init_tmr = otg_timer_initializer(&set_tmout, TB_SRP_INIT,
-                                (unsigned long)&hsm->b_srp_init_tmout);
-        if (b_srp_init_tmr == NULL)
-                return -ENOMEM;
-
-        return 0;
-}
-
-/* Free timers */
-static void langwell_otg_free_timers(void)
-{
-        kfree(a_wait_vrise_tmr);
-        kfree(a_aidl_bdis_tmr);
-        kfree(b_se0_srp_tmr);
-        kfree(b_srp_init_tmr);
-}
-
-/* The timeout callback function to set time out bit */
-static void langwell_otg_timer_fn(unsigned long indicator)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        *(int *)indicator = 1;
-
-        dev_dbg(lnw->dev, "kernel timer - timeout\n");
-
-        langwell_update_transceiver();
-}
-
-/* kernel timer used instead of HW based interrupt */
-static void langwell_otg_add_ktimer(enum langwell_otg_timer_type timers)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        unsigned long           j = jiffies;
-        unsigned long           data, time;
-
-        switch (timers) {
-        case TA_WAIT_VRISE_TMR:
-                iotg->hsm.a_wait_vrise_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_wait_vrise_tmout;
-                time = TA_WAIT_VRISE;
-                break;
-        case TA_WAIT_BCON_TMR:
-                iotg->hsm.a_wait_bcon_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_wait_bcon_tmout;
-                time = TA_WAIT_BCON;
-                break;
-        case TA_AIDL_BDIS_TMR:
-                iotg->hsm.a_aidl_bdis_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_aidl_bdis_tmout;
-                time = TA_AIDL_BDIS;
-                break;
-        case TB_ASE0_BRST_TMR:
-                iotg->hsm.b_ase0_brst_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_ase0_brst_tmout;
-                time = TB_ASE0_BRST;
-                break;
-        case TB_SRP_INIT_TMR:
-                iotg->hsm.b_srp_init_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_srp_init_tmout;
-                time = TB_SRP_INIT;
-                break;
-        case TB_SRP_FAIL_TMR:
-                iotg->hsm.b_srp_fail_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_srp_fail_tmout;
-                time = TB_SRP_FAIL;
-                break;
-        case TB_BUS_SUSPEND_TMR:
-                iotg->hsm.b_bus_suspend_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_bus_suspend_tmout;
-                time = TB_BUS_SUSPEND;
-                break;
-        default:
-                dev_dbg(lnw->dev, "unknown timer, cannot enable it\n");
-                return;
-        }
-
-        lnw->hsm_timer.data = data;
-        lnw->hsm_timer.function = langwell_otg_timer_fn;
-        lnw->hsm_timer.expires = j + time * HZ / 1000; /* milliseconds */
-
-        add_timer(&lnw->hsm_timer);
-
-        dev_dbg(lnw->dev, "add timer successfully\n");
-}
-
-/* Add timer to timer list */
-static void langwell_otg_add_timer(void *gtimer)
-{
-        struct langwell_otg_timer *timer = (struct langwell_otg_timer *)gtimer;
-        struct langwell_otg_timer *tmp_timer;
-        struct intel_mid_otg_xceiv *iotg = &the_transceiver->iotg;
-        u32     val32;
-
-        /* Check if the timer is already in the active list,
-         * if so update timer count
-         */
-        list_for_each_entry(tmp_timer, &active_timers, list)
-                if (tmp_timer == timer) {
-                        timer->count = timer->expires;
-                        return;
-                }
-        timer->count = timer->expires;
-
-        if (list_empty(&active_timers)) {
-                val32 = readl(iotg->base + CI_OTGSC);
-                writel(val32 | OTGSC_1MSE, iotg->base + CI_OTGSC);
-        }
-
-        list_add_tail(&timer->list, &active_timers);
-}
-
-/* Remove timer from the timer list; clear timeout status */
-static void langwell_otg_del_timer(void *gtimer)
-{
-        struct langwell_otg *lnw = the_transceiver;
-        struct langwell_otg_timer *timer = (struct langwell_otg_timer *)gtimer;
-        struct langwell_otg_timer *tmp_timer, *del_tmp;
-        u32 val32;
-
-        list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list)
-                if (tmp_timer == timer)
-                        list_del(&timer->list);
-
-        if (list_empty(&active_timers)) {
-                val32 = readl(lnw->iotg.base + CI_OTGSC);
-                writel(val32 & ~OTGSC_1MSE, lnw->iotg.base + CI_OTGSC);
-        }
-}
-
-/* Reduce timer count by 1, and find timeout conditions.*/
-static int langwell_otg_tick_timer(u32 *int_sts)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        struct langwell_otg_timer *tmp_timer, *del_tmp;
-        int expired = 0;
-
-        list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list) {
-                tmp_timer->count--;
-                /* check if timer expires */
-                if (!tmp_timer->count) {
-                        list_del(&tmp_timer->list);
-                        tmp_timer->function(tmp_timer->data);
-                        expired = 1;
-                }
-        }
-
-        if (list_empty(&active_timers)) {
-                dev_dbg(lnw->dev, "tick timer: disable 1ms int\n");
-                *int_sts = *int_sts & ~OTGSC_1MSE;
-        }
-        return expired;
-}
-
-static void reset_otg(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     delay_time = 1000;
-        u32                     val;
-
-        dev_dbg(lnw->dev, "reseting OTG controller ...\n");
-        val = readl(lnw->iotg.base + CI_USBCMD);
-        writel(val | USBCMD_RST, lnw->iotg.base + CI_USBCMD);
-        do {
-                udelay(100);
-                if (!delay_time--)
-                        dev_dbg(lnw->dev, "reset timeout\n");
-                val = readl(lnw->iotg.base + CI_USBCMD);
-                val &= USBCMD_RST;
-        } while (val != 0);
-        dev_dbg(lnw->dev, "reset done.\n");
-}
-
-static void set_host_mode(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32                     val;
-
-        reset_otg();
-        val = readl(lnw->iotg.base + CI_USBMODE);
-        val = (val & (~USBMODE_CM)) | USBMODE_HOST;
-        writel(val, lnw->iotg.base + CI_USBMODE);
-}
-
-static void set_client_mode(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32                     val;
-
-        reset_otg();
-        val = readl(lnw->iotg.base + CI_USBMODE);
-        val = (val & (~USBMODE_CM)) | USBMODE_DEVICE;
-        writel(val, lnw->iotg.base + CI_USBMODE);
-}
-
-static void init_hsm(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val32;
-
-        /* read OTGSC after reset */
-        val32 = readl(lnw->iotg.base + CI_OTGSC);
-        dev_dbg(lnw->dev, "%s: OTGSC init value = 0x%x\n", __func__, val32);
-
-        /* set init state */
-        if (val32 & OTGSC_ID) {
-                iotg->hsm.id = 1;
-                iotg->otg.default_a = 0;
-                set_client_mode();
-                iotg->otg.state = OTG_STATE_B_IDLE;
-        } else {
-                iotg->hsm.id = 0;
-                iotg->otg.default_a = 1;
-                set_host_mode();
-                iotg->otg.state = OTG_STATE_A_IDLE;
-        }
-
-        /* set session indicator */
-        if (val32 & OTGSC_BSE)
-                iotg->hsm.b_sess_end = 1;
-        if (val32 & OTGSC_BSV)
-                iotg->hsm.b_sess_vld = 1;
-        if (val32 & OTGSC_ASV)
-                iotg->hsm.a_sess_vld = 1;
-        if (val32 & OTGSC_AVV)
-                iotg->hsm.a_vbus_vld = 1;
-
-        /* defautly power the bus */
-        iotg->hsm.a_bus_req = 1;
-        iotg->hsm.a_bus_drop = 0;
-        /* defautly don't request bus as B device */
-        iotg->hsm.b_bus_req = 0;
-        /* no system error */
-        iotg->hsm.a_clr_err = 0;
-
-        langwell_otg_phy_low_power_wait(1);
-}
-
-static void update_hsm(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val32;
-
-        /* read OTGSC */
-        val32 = readl(lnw->iotg.base + CI_OTGSC);
-        dev_dbg(lnw->dev, "%s: OTGSC value = 0x%x\n", __func__, val32);
-
-        iotg->hsm.id = !!(val32 & OTGSC_ID);
-        iotg->hsm.b_sess_end = !!(val32 & OTGSC_BSE);
-        iotg->hsm.b_sess_vld = !!(val32 & OTGSC_BSV);
-        iotg->hsm.a_sess_vld = !!(val32 & OTGSC_ASV);
-        iotg->hsm.a_vbus_vld = !!(val32 & OTGSC_AVV);
-}
-
-static irqreturn_t otg_dummy_irq(int irq, void *_dev)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        void __iomem            *reg_base = _dev;
-        u32                     val;
-        u32                     int_mask = 0;
-
-        val = readl(reg_base + CI_USBMODE);
-        if ((val & USBMODE_CM) != USBMODE_DEVICE)
-                return IRQ_NONE;
-
-        val = readl(reg_base + CI_USBSTS);
-        int_mask = val & INTR_DUMMY_MASK;
-
-        if (int_mask == 0)
-                return IRQ_NONE;
-
-        /* clear hsm.b_conn here since host driver can't detect it
-        *  otg_dummy_irq called means B-disconnect happened.
-        */
-        if (lnw->iotg.hsm.b_conn) {
-                lnw->iotg.hsm.b_conn = 0;
-                if (spin_trylock(&lnw->wq_lock)) {
-                        langwell_update_transceiver();
-                        spin_unlock(&lnw->wq_lock);
-                }
-        }
-
-        /* Clear interrupts */
-        writel(int_mask, reg_base + CI_USBSTS);
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t otg_irq(int irq, void *_dev)
-{
-        struct langwell_otg             *lnw = _dev;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             int_sts, int_en;
-        u32                             int_mask = 0;
-        int                             flag = 0;
-
-        int_sts = readl(lnw->iotg.base + CI_OTGSC);
-        int_en = (int_sts & OTGSC_INTEN_MASK) >> 8;
-        int_mask = int_sts & int_en;
-        if (int_mask == 0)
-                return IRQ_NONE;
-
-        if (int_mask & OTGSC_IDIS) {
-                dev_dbg(lnw->dev, "%s: id change int\n", __func__);
-                iotg->hsm.id = (int_sts & OTGSC_ID) ? 1 : 0;
-                dev_dbg(lnw->dev, "id = %d\n", iotg->hsm.id);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_DPIS) {
-                dev_dbg(lnw->dev, "%s: data pulse int\n", __func__);
-                iotg->hsm.a_srp_det = (int_sts & OTGSC_DPS) ? 1 : 0;
-                dev_dbg(lnw->dev, "data pulse = %d\n", iotg->hsm.a_srp_det);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_BSEIS) {
-                dev_dbg(lnw->dev, "%s: b session end int\n", __func__);
-                iotg->hsm.b_sess_end = (int_sts & OTGSC_BSE) ? 1 : 0;
-                dev_dbg(lnw->dev, "b_sess_end = %d\n", iotg->hsm.b_sess_end);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_BSVIS) {
-                dev_dbg(lnw->dev, "%s: b session valid int\n", __func__);
-                iotg->hsm.b_sess_vld = (int_sts & OTGSC_BSV) ? 1 : 0;
-                dev_dbg(lnw->dev, "b_sess_vld = %d\n", iotg->hsm.b_sess_end);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_ASVIS) {
-                dev_dbg(lnw->dev, "%s: a session valid int\n", __func__);
-                iotg->hsm.a_sess_vld = (int_sts & OTGSC_ASV) ? 1 : 0;
-                dev_dbg(lnw->dev, "a_sess_vld = %d\n", iotg->hsm.a_sess_vld);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_AVVIS) {
-                dev_dbg(lnw->dev, "%s: a vbus valid int\n", __func__);
-                iotg->hsm.a_vbus_vld = (int_sts & OTGSC_AVV) ? 1 : 0;
-                dev_dbg(lnw->dev, "a_vbus_vld = %d\n", iotg->hsm.a_vbus_vld);
-                flag = 1;
-        }
-
-        if (int_mask & OTGSC_1MSS) {
-                /* need to schedule otg_work if any timer is expired */
-                if (langwell_otg_tick_timer(&int_sts))
-                        flag = 1;
-        }
-
-        writel((int_sts & ~OTGSC_INTSTS_MASK) | int_mask,
-                                        lnw->iotg.base + CI_OTGSC);
-        if (flag)
-                langwell_update_transceiver();
-
-        return IRQ_HANDLED;
-}
-
-static int langwell_otg_iotg_notify(struct notifier_block *nb,
-                                unsigned long action, void *data)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = data;
-        int                             flag = 0;
-
-        if (iotg == NULL)
-                return NOTIFY_BAD;
-
-        if (lnw == NULL)
-                return NOTIFY_BAD;
-
-        switch (action) {
-        case MID_OTG_NOTIFY_CONNECT:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Connect Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_conn = 1;
-                else
-                        iotg->hsm.a_conn = 1;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_DISCONN:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Disconnect Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_conn = 0;
-                else
-                        iotg->hsm.a_conn = 0;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HSUSPEND:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Host Bus suspend Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.a_suspend_req = 1;
-                else
-                        iotg->hsm.b_bus_req = 0;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HRESUME:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Host Bus resume Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_bus_resume = 1;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CSUSPEND:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Client Bus suspend Event\n");
-                if (iotg->otg.default_a == 1) {
-                        if (iotg->hsm.b_bus_suspend_vld == 2) {
-                                iotg->hsm.b_bus_suspend = 1;
-                                iotg->hsm.b_bus_suspend_vld = 0;
-                                flag = 1;
-                        } else {
-                                iotg->hsm.b_bus_suspend_vld++;
-                                flag = 0;
-                        }
-                } else {
-                        if (iotg->hsm.a_bus_suspend == 0) {
-                                iotg->hsm.a_bus_suspend = 1;
-                                flag = 1;
-                        }
-                }
-                break;
-        case MID_OTG_NOTIFY_CRESUME:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Client Bus resume Event\n");
-                if (iotg->otg.default_a == 0)
-                        iotg->hsm.a_bus_suspend = 0;
-                flag = 0;
-                break;
-        case MID_OTG_NOTIFY_HOSTADD:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Host Driver Add\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HOSTREMOVE:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Host Driver remove\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CLIENTADD:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Client Driver Add\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CLIENTREMOVE:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Client Driver remove\n");
-                flag = 1;
-                break;
-        default:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity unknown notify message\n");
-                return NOTIFY_DONE;
-        }
-
-        if (flag)
-                langwell_update_transceiver();
-
-        return NOTIFY_OK;
-}
-
-static void langwell_otg_work(struct work_struct *work)
-{
-        struct langwell_otg             *lnw;
-        struct intel_mid_otg_xceiv      *iotg;
-        int                             retval;
-        struct pci_dev                  *pdev;
-
-        lnw = container_of(work, struct langwell_otg, work);
-        iotg = &lnw->iotg;
-        pdev = to_pci_dev(lnw->dev);
-
-        dev_dbg(lnw->dev, "%s: old state = %s\n", __func__,
-                        otg_state_string(iotg->otg.state));
-
-        switch (iotg->otg.state) {
-        case OTG_STATE_UNDEFINED:
-        case OTG_STATE_B_IDLE:
-                if (!iotg->hsm.id) {
-                        langwell_otg_del_timer(b_srp_init_tmr);
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.b_sess_vld) {
-                        langwell_otg_del_timer(b_srp_init_tmr);
-                        del_timer_sync(&lnw->hsm_timer);
-                        iotg->hsm.b_sess_end = 0;
-                        iotg->hsm.a_bus_suspend = 0;
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.start_peripheral) {
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                        } else
-                                dev_dbg(lnw->dev, "client driver not loaded\n");
-
-                } else if (iotg->hsm.b_srp_init_tmout) {
-                        iotg->hsm.b_srp_init_tmout = 0;
-                        dev_warn(lnw->dev, "SRP init timeout\n");
-                } else if (iotg->hsm.b_srp_fail_tmout) {
-                        iotg->hsm.b_srp_fail_tmout = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        /* No silence failure */
-                        langwell_otg_nsf_msg(6);
-                } else if (iotg->hsm.b_bus_req && iotg->hsm.b_sess_end) {
-                        del_timer_sync(&lnw->hsm_timer);
-                        /* workaround for b_se0_srp detection */
-                        retval = langwell_otg_check_se0_srp(0);
-                        if (retval) {
-                                iotg->hsm.b_bus_req = 0;
-                                dev_dbg(lnw->dev, "LS isn't SE0, try later\n");
-                        } else {
-                                /* clear the PHCD before start srp */
-                                langwell_otg_phy_low_power(0);
-
-                                /* Start SRP */
-                                langwell_otg_add_timer(b_srp_init_tmr);
-                                iotg->otg.start_srp(&iotg->otg);
-                                langwell_otg_del_timer(b_srp_init_tmr);
-                                langwell_otg_add_ktimer(TB_SRP_FAIL_TMR);
-
-                                /* reset PHY low power mode here */
-                                langwell_otg_phy_low_power_wait(1);
-                        }
-                }
-                break;
-        case OTG_STATE_B_SRP_INIT:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_chrg_vbus(0);
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.b_sess_vld) {
-                        langwell_otg_chrg_vbus(0);
-                        if (lnw->iotg.start_peripheral) {
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                        } else
-                                dev_dbg(lnw->dev, "client driver not loaded\n");
-                }
-                break;
-        case OTG_STATE_B_PERIPHERAL:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        iotg->hsm.b_hnp_enable = 0;
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.b_bus_req && iotg->otg.gadget &&
-                                        iotg->otg.gadget->b_hnp_enable &&
-                                        iotg->hsm.a_bus_suspend) {
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        langwell_otg_HAAR(1);
-                        iotg->hsm.a_conn = 0;
-
-                        if (lnw->iotg.start_host) {
-                                lnw->iotg.start_host(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_WAIT_ACON;
-                        } else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-
-                        iotg->hsm.a_bus_resume = 0;
-                        langwell_otg_add_ktimer(TB_ASE0_BRST_TMR);
-                }
-                break;
-
-        case OTG_STATE_B_WAIT_ACON:
-                if (!iotg->hsm.id) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        langwell_otg_HAAR(0);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->hsm.b_hnp_enable = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        langwell_otg_HAAR(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.a_conn) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        langwell_otg_HAAR(0);
-                        iotg->otg.state = OTG_STATE_B_HOST;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_resume ||
-                                iotg->hsm.b_ase0_brst_tmout) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        langwell_otg_HAAR(0);
-                        langwell_otg_nsf_msg(7);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.a_bus_suspend = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver not loaded.\n");
-
-                        iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                }
-                break;
-
-        case OTG_STATE_B_HOST:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        iotg->hsm.b_hnp_enable = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if ((!iotg->hsm.b_bus_req) ||
-                                (!iotg->hsm.a_conn)) {
-                        iotg->hsm.b_bus_req = 0;
-                        langwell_otg_loc_sof(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.a_bus_suspend = 0;
-
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "client driver not loaded.\n");
-
-                        iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                }
-                break;
-
-        case OTG_STATE_A_IDLE:
-                iotg->otg.default_a = 1;
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-                        iotg->hsm.vbus_srp_up = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_bus_drop &&
-                        (iotg->hsm.a_srp_det || iotg->hsm.a_bus_req)) {
-                        langwell_otg_phy_low_power(0);
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-
-                        iotg->hsm.vbus_srp_up = 0;
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_bus_drop && iotg->hsm.a_sess_vld) {
-                        iotg->hsm.vbus_srp_up = 1;
-                } else if (!iotg->hsm.a_sess_vld && iotg->hsm.vbus_srp_up) {
-                        msleep(10);
-                        langwell_otg_phy_low_power(0);
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-                        iotg->hsm.a_srp_det = 1;
-                        iotg->hsm.vbus_srp_up = 0;
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_sess_vld &&
-                                !iotg->hsm.vbus_srp_up) {
-                        langwell_otg_phy_low_power(1);
-                }
-                break;
-        case OTG_STATE_A_WAIT_VRISE:
-                if (iotg->hsm.id) {
-                        langwell_otg_del_timer(a_wait_vrise_tmr);
-                        iotg->hsm.b_bus_req = 0;
-                        iotg->otg.default_a = 0;
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.a_vbus_vld) {
-                        langwell_otg_del_timer(a_wait_vrise_tmr);
-                        iotg->hsm.b_conn = 0;
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else {
-                                dev_dbg(lnw->dev, "host driver not loaded.\n");
-                                break;
-                        }
-
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                } else if (iotg->hsm.a_wait_vrise_tmout) {
-                        iotg->hsm.b_conn = 0;
-                        if (iotg->hsm.a_vbus_vld) {
-                                if (lnw->iotg.start_host)
-                                        lnw->iotg.start_host(&lnw->iotg);
-                                else {
-                                        dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                                        break;
-                                }
-                                langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                                iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                        } else {
-
-                                /* Turn off VBus */
-                                iotg->otg.set_vbus(&iotg->otg, false);
-                                langwell_otg_phy_low_power_wait(1);
-                                iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                        }
-                }
-                break;
-        case OTG_STATE_A_WAIT_BCON:
-                if (iotg->hsm.id) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->hsm.a_bus_drop ||
-                                (iotg->hsm.a_wait_bcon_tmout &&
-                                !iotg->hsm.a_bus_req)) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (iotg->hsm.b_conn) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->hsm.a_suspend_req = 0;
-                        iotg->otg.state = OTG_STATE_A_HOST;
-                        if (iotg->hsm.a_srp_det && iotg->otg.host &&
-                                        !iotg->otg.host->b_hnp_enable) {
-                                /* SRP capable peripheral-only device */
-                                iotg->hsm.a_bus_req = 1;
-                                iotg->hsm.a_srp_det = 0;
-                        } else if (!iotg->hsm.a_bus_req && iotg->otg.host &&
-                                        iotg->otg.host->b_hnp_enable) {
-                                /* It is not safe enough to do a fast
-                                 * transition from A_WAIT_BCON to
-                                 * A_SUSPEND */
-                                msleep(10000);
-                                if (iotg->hsm.a_bus_req)
-                                        break;
-
-                                if (request_irq(pdev->irq,
-                                        otg_dummy_irq, IRQF_SHARED,
-                                        driver_name, iotg->base) != 0) {
-                                        dev_dbg(lnw->dev,
-                                                "request interrupt %d fail\n",
-                                                pdev->irq);
-                                }
-
-                                langwell_otg_HABA(1);
-                                iotg->hsm.b_bus_resume = 0;
-                                iotg->hsm.a_aidl_bdis_tmout = 0;
-
-                                langwell_otg_loc_sof(0);
-                                /* clear PHCD to enable HW timer */
-                                langwell_otg_phy_low_power(0);
-                                langwell_otg_add_timer(a_aidl_bdis_tmr);
-                                iotg->otg.state = OTG_STATE_A_SUSPEND;
-                        } else if (!iotg->hsm.a_bus_req && iotg->otg.host &&
-                                !iotg->otg.host->b_hnp_enable) {
-                                if (lnw->iotg.stop_host)
-                                        lnw->iotg.stop_host(&lnw->iotg);
-                                else
-                                        dev_dbg(lnw->dev,
-                                                "host driver removed.\n");
-
-                                /* Turn off VBus */
-                                iotg->otg.set_vbus(&iotg->otg, false);
-                                iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                        }
-                }
-                break;
-        case OTG_STATE_A_HOST:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_drop ||
-                                (iotg->otg.host &&
-                                !iotg->otg.host->b_hnp_enable &&
-                                        !iotg->hsm.a_bus_req)) {
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->otg.host &&
-                                iotg->otg.host->b_hnp_enable &&
-                                !iotg->hsm.a_bus_req) {
-                        /* Set HABA to enable hardware assistance to signal
-                         *  A-connect after receiver B-disconnect. Hardware
-                         *  will then set client mode and enable URE, SLE and
-                         *  PCE after the assistance. otg_dummy_irq is used to
-                         *  clean these ints when client driver is not resumed.
-                         */
-                        if (request_irq(pdev->irq, otg_dummy_irq, IRQF_SHARED,
-                                        driver_name, iotg->base) != 0) {
-                                dev_dbg(lnw->dev,
-                                        "request interrupt %d failed\n",
-                                                pdev->irq);
-                        }
-
-                        /* set HABA */
-                        langwell_otg_HABA(1);
-                        iotg->hsm.b_bus_resume = 0;
-                        iotg->hsm.a_aidl_bdis_tmout = 0;
-                        langwell_otg_loc_sof(0);
-                        /* clear PHCD to enable HW timer */
-                        langwell_otg_phy_low_power(0);
-                        langwell_otg_add_timer(a_aidl_bdis_tmr);
-                        iotg->otg.state = OTG_STATE_A_SUSPEND;
-                } else if (!iotg->hsm.b_conn || !iotg->hsm.a_bus_req) {
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                }
-                break;
-        case OTG_STATE_A_SUSPEND:
-                if (iotg->hsm.id) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_req ||
-                                iotg->hsm.b_bus_resume) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        iotg->hsm.a_suspend_req = 0;
-                        langwell_otg_loc_sof(1);
-                        iotg->otg.state = OTG_STATE_A_HOST;
-                } else if (iotg->hsm.a_aidl_bdis_tmout ||
-                                iotg->hsm.a_bus_drop) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (!iotg->hsm.b_conn && iotg->otg.host &&
-                                iotg->otg.host->b_hnp_enable) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.b_bus_suspend = 0;
-                        iotg->hsm.b_bus_suspend_vld = 0;
-
-                        /* msleep(200); */
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver not loaded.\n");
-
-                        langwell_otg_add_ktimer(TB_BUS_SUSPEND_TMR);
-                        iotg->otg.state = OTG_STATE_A_PERIPHERAL;
-                        break;
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                }
-                break;
-        case OTG_STATE_A_PERIPHERAL:
-                if (iotg->hsm.id) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->hsm.a_bus_drop) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (iotg->hsm.b_bus_suspend) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                } else if (iotg->hsm.b_bus_suspend_tmout) {
-                        u32     val;
-                        val = readl(lnw->iotg.base + CI_PORTSC1);
-                        if (!(val & PORTSC_SUSP))
-                                break;
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                }
-                break;
-        case OTG_STATE_A_VBUS_ERR:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.a_clr_err = 0;
-                        iotg->hsm.a_srp_det = 0;
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_clr_err) {
-                        iotg->hsm.a_clr_err = 0;
-                        iotg->hsm.a_srp_det = 0;
-                        reset_otg();
-                        init_hsm();
-                        if (iotg->otg.state == OTG_STATE_A_IDLE)
-                                langwell_update_transceiver();
-                } else {
-                        /* FW will clear PHCD bit when any VBus
-                         * event detected. Reset PHCD to 1 again */
-                        langwell_otg_phy_low_power(1);
-                }
-                break;
-        case OTG_STATE_A_WAIT_VFALL:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_req) {
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                } else if (!iotg->hsm.a_sess_vld) {
-                        iotg->hsm.a_srp_det = 0;
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                }
-                break;
-        default:
-                ;
-        }
-
-        dev_dbg(lnw->dev, "%s: new state = %s\n", __func__,
-                        otg_state_string(iotg->otg.state));
-}
-
-static ssize_t
-show_registers(struct device *_dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size,
-                "\n"
-                "USBCMD = 0x%08x\n"
-                "USBSTS = 0x%08x\n"
-                "USBINTR = 0x%08x\n"
-                "ASYNCLISTADDR = 0x%08x\n"
-                "PORTSC1 = 0x%08x\n"
-                "HOSTPC1 = 0x%08x\n"
-                "OTGSC = 0x%08x\n"
-                "USBMODE = 0x%08x\n",
-                readl(lnw->iotg.base + 0x30),
-                readl(lnw->iotg.base + 0x34),
-                readl(lnw->iotg.base + 0x38),
-                readl(lnw->iotg.base + 0x48),
-                readl(lnw->iotg.base + 0x74),
-                readl(lnw->iotg.base + 0xb4),
-                readl(lnw->iotg.base + 0xf4),
-                readl(lnw->iotg.base + 0xf8)
-             );
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL);
-
-static ssize_t
-show_hsm(struct device *_dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        char                            *next;
-        unsigned                        size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        if (iotg->otg.host)
-                iotg->hsm.a_set_b_hnp_en = iotg->otg.host->b_hnp_enable;
-
-        if (iotg->otg.gadget)
-                iotg->hsm.b_hnp_enable = iotg->otg.gadget->b_hnp_enable;
-
-        t = scnprintf(next, size,
-                "\n"
-                "current state = %s\n"
-                "a_bus_resume = \t%d\n"
-                "a_bus_suspend = \t%d\n"
-                "a_conn = \t%d\n"
-                "a_sess_vld = \t%d\n"
-                "a_srp_det = \t%d\n"
-                "a_vbus_vld = \t%d\n"
-                "b_bus_resume = \t%d\n"
-                "b_bus_suspend = \t%d\n"
-                "b_conn = \t%d\n"
-                "b_se0_srp = \t%d\n"
-                "b_sess_end = \t%d\n"
-                "b_sess_vld = \t%d\n"
-                "id = \t%d\n"
-                "a_set_b_hnp_en = \t%d\n"
-                "b_srp_done = \t%d\n"
-                "b_hnp_enable = \t%d\n"
-                "a_wait_vrise_tmout = \t%d\n"
-                "a_wait_bcon_tmout = \t%d\n"
-                "a_aidl_bdis_tmout = \t%d\n"
-                "b_ase0_brst_tmout = \t%d\n"
-                "a_bus_drop = \t%d\n"
-                "a_bus_req = \t%d\n"
-                "a_clr_err = \t%d\n"
-                "a_suspend_req = \t%d\n"
-                "b_bus_req = \t%d\n"
-                "b_bus_suspend_tmout = \t%d\n"
-                "b_bus_suspend_vld = \t%d\n",
-                otg_state_string(iotg->otg.state),
-                iotg->hsm.a_bus_resume,
-                iotg->hsm.a_bus_suspend,
-                iotg->hsm.a_conn,
-                iotg->hsm.a_sess_vld,
-                iotg->hsm.a_srp_det,
-                iotg->hsm.a_vbus_vld,
-                iotg->hsm.b_bus_resume,
-                iotg->hsm.b_bus_suspend,
-                iotg->hsm.b_conn,
-                iotg->hsm.b_se0_srp,
-                iotg->hsm.b_sess_end,
-                iotg->hsm.b_sess_vld,
-                iotg->hsm.id,
-                iotg->hsm.a_set_b_hnp_en,
-                iotg->hsm.b_srp_done,
-                iotg->hsm.b_hnp_enable,
-                iotg->hsm.a_wait_vrise_tmout,
-                iotg->hsm.a_wait_bcon_tmout,
-                iotg->hsm.a_aidl_bdis_tmout,
-                iotg->hsm.b_ase0_brst_tmout,
-                iotg->hsm.a_bus_drop,
-                iotg->hsm.a_bus_req,
-                iotg->hsm.a_clr_err,
-                iotg->hsm.a_suspend_req,
-                iotg->hsm.b_bus_req,
-                iotg->hsm.b_bus_suspend_tmout,
-                iotg->hsm.b_bus_suspend_vld
-                );
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-static DEVICE_ATTR(hsm, S_IRUGO, show_hsm, NULL);
-
-static ssize_t
-get_a_bus_req(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.a_bus_req);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_a_bus_req(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.a_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_req = 0\n");
-        } else if (buf[0] == '1') {
-                /* If a_bus_drop is TRUE, a_bus_req can't be set */
-                if (iotg->hsm.a_bus_drop)
-                        return -1;
-                iotg->hsm.a_bus_req = 1;
-                dev_dbg(lnw->dev, "User request: a_bus_req = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_bus_req, S_IRUGO | S_IWUSR, get_a_bus_req, set_a_bus_req);
-
-static ssize_t
-get_a_bus_drop(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.a_bus_drop);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_a_bus_drop(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.a_bus_drop = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_drop = 0\n");
-        } else if (buf[0] == '1') {
-                iotg->hsm.a_bus_drop = 1;
-                iotg->hsm.a_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_drop = 1\n");
-                dev_dbg(lnw->dev, "User request: and a_bus_req = 0\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_bus_drop, S_IRUGO | S_IWUSR, get_a_bus_drop, set_a_bus_drop);
-
-static ssize_t
-get_b_bus_req(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.b_bus_req);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_b_bus_req(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (iotg->otg.default_a)
-                return -1;
-
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.b_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: b_bus_req = 0\n");
-        } else if (buf[0] == '1') {
-                iotg->hsm.b_bus_req = 1;
-                dev_dbg(lnw->dev, "User request: b_bus_req = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(b_bus_req, S_IRUGO | S_IWUSR, get_b_bus_req, set_b_bus_req);
-
-static ssize_t
-set_a_clr_err(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '1') {
-                iotg->hsm.a_clr_err = 1;
-                dev_dbg(lnw->dev, "User request: a_clr_err = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_clr_err, S_IWUSR, NULL, set_a_clr_err);
-
-static struct attribute *inputs_attrs[] = {
-        &dev_attr_a_bus_req.attr,
-        &dev_attr_a_bus_drop.attr,
-        &dev_attr_b_bus_req.attr,
-        &dev_attr_a_clr_err.attr,
-        NULL,
-};
-
-static struct attribute_group debug_dev_attr_group = {
-        .name = "inputs",
-        .attrs = inputs_attrs,
-};
-
-static int langwell_otg_probe(struct pci_dev *pdev,
-                const struct pci_device_id *id)
-{
-        unsigned long           resource, len;
-        void __iomem            *base = NULL;
-        int                     retval;
-        u32                     val32;
-        struct langwell_otg     *lnw;
-        char                    qname[] = "langwell_otg_queue";
-
-        retval = 0;
-        dev_dbg(&pdev->dev, "\notg controller is detected.\n");
-        if (pci_enable_device(pdev) < 0) {
-                retval = -ENODEV;
-                goto done;
-        }
-
-        lnw = kzalloc(sizeof *lnw, GFP_KERNEL);
-        if (lnw == NULL) {
-                retval = -ENOMEM;
-                goto done;
-        }
-        the_transceiver = lnw;
-
-        /* control register: BAR 0 */
-        resource = pci_resource_start(pdev, 0);
-        len = pci_resource_len(pdev, 0);
-        if (!request_mem_region(resource, len, driver_name)) {
-                retval = -EBUSY;
-                goto err;
-        }
-        lnw->region = 1;
-
-        base = ioremap_nocache(resource, len);
-        if (base == NULL) {
-                retval = -EFAULT;
-                goto err;
-        }
-        lnw->iotg.base = base;
-
-        if (!request_mem_region(USBCFG_ADDR, USBCFG_LEN, driver_name)) {
-                retval = -EBUSY;
-                goto err;
-        }
-        lnw->cfg_region = 1;
-
-        /* For the SCCB.USBCFG register */
-        base = ioremap_nocache(USBCFG_ADDR, USBCFG_LEN);
-        if (base == NULL) {
-                retval = -EFAULT;
-                goto err;
-        }
-        lnw->usbcfg = base;
-
-        if (!pdev->irq) {
-                dev_dbg(&pdev->dev, "No IRQ.\n");
-                retval = -ENODEV;
-                goto err;
-        }
-
-        lnw->qwork = create_singlethread_workqueue(qname);
-        if (!lnw->qwork) {
-                dev_dbg(&pdev->dev, "cannot create workqueue %s\n", qname);
-                retval = -ENOMEM;
-                goto err;
-        }
-        INIT_WORK(&lnw->work, langwell_otg_work);
-
-        /* OTG common part */
-        lnw->dev = &pdev->dev;
-        lnw->iotg.otg.dev = lnw->dev;
-        lnw->iotg.otg.label = driver_name;
-        lnw->iotg.otg.set_host = langwell_otg_set_host;
-        lnw->iotg.otg.set_peripheral = langwell_otg_set_peripheral;
-        lnw->iotg.otg.set_power = langwell_otg_set_power;
-        lnw->iotg.otg.set_vbus = langwell_otg_set_vbus;
-        lnw->iotg.otg.start_srp = langwell_otg_start_srp;
-        lnw->iotg.otg.state = OTG_STATE_UNDEFINED;
-
-        if (otg_set_transceiver(&lnw->iotg.otg)) {
-                dev_dbg(lnw->dev, "can't set transceiver\n");
-                retval = -EBUSY;
-                goto err;
-        }
-
-        reset_otg();
-        init_hsm();
-
-        spin_lock_init(&lnw->lock);
-        spin_lock_init(&lnw->wq_lock);
-        INIT_LIST_HEAD(&active_timers);
-        retval = langwell_otg_init_timers(&lnw->iotg.hsm);
-        if (retval) {
-                dev_dbg(&pdev->dev, "Failed to init timers\n");
-                goto err;
-        }
-
-        init_timer(&lnw->hsm_timer);
-        ATOMIC_INIT_NOTIFIER_HEAD(&lnw->iotg.iotg_notifier);
-
-        lnw->iotg_notifier.notifier_call = langwell_otg_iotg_notify;
-
-        retval = intel_mid_otg_register_notifier(&lnw->iotg,
-                                                &lnw->iotg_notifier);
-        if (retval) {
-                dev_dbg(lnw->dev, "Failed to register notifier\n");
-                goto err;
-        }
-
-        if (request_irq(pdev->irq, otg_irq, IRQF_SHARED,
-                                driver_name, lnw) != 0) {
-                dev_dbg(lnw->dev, "request interrupt %d failed\n", pdev->irq);
-                retval = -EBUSY;
-                goto err;
-        }
-
-        /* enable OTGSC int */
-        val32 = OTGSC_DPIE | OTGSC_BSEIE | OTGSC_BSVIE |
-                OTGSC_ASVIE | OTGSC_AVVIE | OTGSC_IDIE | OTGSC_IDPU;
-        writel(val32, lnw->iotg.base + CI_OTGSC);
-
-        retval = device_create_file(&pdev->dev, &dev_attr_registers);
-        if (retval < 0) {
-                dev_dbg(lnw->dev,
-                        "Can't register sysfs attribute: %d\n", retval);
-                goto err;
-        }
-
-        retval = device_create_file(&pdev->dev, &dev_attr_hsm);
-        if (retval < 0) {
-                dev_dbg(lnw->dev, "Can't hsm sysfs attribute: %d\n", retval);
-                goto err;
-        }
-
-        retval = sysfs_create_group(&pdev->dev.kobj, &debug_dev_attr_group);
-        if (retval < 0) {
-                dev_dbg(lnw->dev,
-                        "Can't register sysfs attr group: %d\n", retval);
-                goto err;
-        }
-
-        if (lnw->iotg.otg.state == OTG_STATE_A_IDLE)
-                langwell_update_transceiver();
-
-        return 0;
-
-err:
-        if (the_transceiver)
-                langwell_otg_remove(pdev);
-done:
-        return retval;
-}
-
-static void langwell_otg_remove(struct pci_dev *pdev)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        if (lnw->qwork) {
-                flush_workqueue(lnw->qwork);
-                destroy_workqueue(lnw->qwork);
-        }
-        intel_mid_otg_unregister_notifier(&lnw->iotg, &lnw->iotg_notifier);
-        langwell_otg_free_timers();
-
-        /* disable OTGSC interrupt as OTGSC doesn't change in reset */
-        writel(0, lnw->iotg.base + CI_OTGSC);
-
-        if (pdev->irq)
-                free_irq(pdev->irq, lnw);
-        if (lnw->usbcfg)
-                iounmap(lnw->usbcfg);
-        if (lnw->cfg_region)
-                release_mem_region(USBCFG_ADDR, USBCFG_LEN);
-        if (lnw->iotg.base)
-                iounmap(lnw->iotg.base);
-        if (lnw->region)
-                release_mem_region(pci_resource_start(pdev, 0),
-                                pci_resource_len(pdev, 0));
-
-        otg_set_transceiver(NULL);
-        pci_disable_device(pdev);
-        sysfs_remove_group(&pdev->dev.kobj, &debug_dev_attr_group);
-        device_remove_file(&pdev->dev, &dev_attr_hsm);
-        device_remove_file(&pdev->dev, &dev_attr_registers);
-        kfree(lnw);
-        lnw = NULL;
-}
-
-static void transceiver_suspend(struct pci_dev *pdev)
-{
-        pci_save_state(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
-        langwell_otg_phy_low_power(1);
-}
-
-static int langwell_otg_suspend(struct pci_dev *pdev, pm_message_t message)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        int                             ret = 0;
-
-        /* Disbale OTG interrupts */
-        langwell_otg_intr(0);
-
-        if (pdev->irq)
-                free_irq(pdev->irq, lnw);
-
-        /* Prevent more otg_work */
-        flush_workqueue(lnw->qwork);
-        destroy_workqueue(lnw->qwork);
-        lnw->qwork = NULL;
-
-        /* start actions */
-        switch (iotg->otg.state) {
-        case OTG_STATE_A_WAIT_VFALL:
-                iotg->otg.state = OTG_STATE_A_IDLE;
-        case OTG_STATE_A_IDLE:
-        case OTG_STATE_B_IDLE:
-        case OTG_STATE_A_VBUS_ERR:
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_WAIT_VRISE:
-                langwell_otg_del_timer(a_wait_vrise_tmr);
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_WAIT_BCON:
-                del_timer_sync(&lnw->hsm_timer);
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_HOST:
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_SUSPEND:
-                langwell_otg_del_timer(a_aidl_bdis_tmr);
-                langwell_otg_HABA(0);
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(lnw->dev, "host driver has been removed.\n");
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_PERIPHERAL:
-                del_timer_sync(&lnw->hsm_timer);
-
-                if (lnw->iotg.stop_peripheral)
-                        lnw->iotg.stop_peripheral(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev,
-                                "client driver has been removed.\n");
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_HOST:
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-                iotg->hsm.b_bus_req = 0;
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_PERIPHERAL:
-                if (lnw->iotg.stop_peripheral)
-                        lnw->iotg.stop_peripheral(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev,
-                                "client driver has been removed.\n");
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_WAIT_ACON:
-                /* delete hsm timer for b_ase0_brst_tmr */
-                del_timer_sync(&lnw->hsm_timer);
-
-                langwell_otg_HAAR(0);
-
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-                iotg->hsm.b_bus_req = 0;
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        default:
-                dev_dbg(lnw->dev, "error state before suspend\n");
-                break;
-        }
-
-        return ret;
-}
-
-static void transceiver_resume(struct pci_dev *pdev)
-{
-        pci_restore_state(pdev);
-        pci_set_power_state(pdev, PCI_D0);
-}
-
-static int langwell_otg_resume(struct pci_dev *pdev)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     ret = 0;
-
-        transceiver_resume(pdev);
-
-        lnw->qwork = create_singlethread_workqueue("langwell_otg_queue");
-        if (!lnw->qwork) {
-                dev_dbg(&pdev->dev, "cannot create langwell otg workqueuen");
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        if (request_irq(pdev->irq, otg_irq, IRQF_SHARED,
-                                driver_name, lnw) != 0) {
-                dev_dbg(&pdev->dev, "request interrupt %d failed\n", pdev->irq);
-                ret = -EBUSY;
-                goto error;
-        }
-
-        /* enable OTG interrupts */
-        langwell_otg_intr(1);
-
-        update_hsm();
-
-        langwell_update_transceiver();
-
-        return ret;
-error:
-        langwell_otg_intr(0);
-        transceiver_suspend(pdev);
-        return ret;
-}
-
-static int __init langwell_otg_init(void)
-{
-        return pci_register_driver(&otg_pci_driver);
-}
-module_init(langwell_otg_init);
-
-static void __exit langwell_otg_cleanup(void)
-{
-        pci_unregister_driver(&otg_pci_driver);
-}
-module_exit(langwell_otg_cleanup);
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c
index db0d4fcdc8e2..b5fbe1452ab0 100644
--- a/drivers/usb/otg/mv_otg.c
+++ b/drivers/usb/otg/mv_otg.c
@@ -202,6 +202,7 @@ static void mv_otg_init_irq(struct mv_otg *mvotg)
 
 static void mv_otg_start_host(struct mv_otg *mvotg, int on)
 {
+#ifdef CONFIG_USB
         struct otg_transceiver *otg = &mvotg->otg;
         struct usb_hcd *hcd;
 
@@ -216,6 +217,7 @@ static void mv_otg_start_host(struct mv_otg *mvotg, int on)
                 usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
         else
                 usb_remove_hcd(hcd);
+#endif /* CONFIG_USB */
 }
 
 static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on)
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 528691d5f3e2..7542aa94a462 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -425,7 +425,7 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
         struct usbhs_pipe *pipe;
         int recip = ctrl->bRequestType & USB_RECIP_MASK;
         int nth = le16_to_cpu(ctrl->wIndex) & USB_ENDPOINT_NUMBER_MASK;
-        int ret;
+        int ret = 0;
         int (*func)(struct usbhs_priv *priv, struct usbhsg_uep *uep,
                     struct usb_ctrlrequest *ctrl);
         char *msg;
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index fba1147ed916..8dbf51a43c45 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -39,6 +39,8 @@ static void cp210x_get_termios(struct tty_struct *,
         struct usb_serial_port *port);
 static void cp210x_get_termios_port(struct usb_serial_port *port,
         unsigned int *cflagp, unsigned int *baudp);
+static void cp210x_change_speed(struct tty_struct *, struct usb_serial_port *,
+                                                        struct ktermios *);
 static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *,
                                                         struct ktermios*);
 static int cp210x_tiocmget(struct tty_struct *);
@@ -138,6 +140,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
         { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
         { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */
+        { USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
         { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
         { } /* Terminating Entry */
 };
@@ -201,6 +204,8 @@ static struct usb_serial_driver cp210x_device = {
 #define CP210X_EMBED_EVENTS     0x15
 #define CP210X_GET_EVENTSTATE   0x16
 #define CP210X_SET_CHARS        0x19
+#define CP210X_GET_BAUDRATE     0x1D
+#define CP210X_SET_BAUDRATE     0x1E
 
 /* CP210X_IFC_ENABLE */
 #define UART_ENABLE             0x0001
@@ -360,8 +365,8 @@ static inline int cp210x_set_config_single(struct usb_serial_port *port,
  * Quantises the baud rate as per AN205 Table 1
  */
 static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
-        if      (baud <= 56)       baud = 0;
-        else if (baud <= 300)      baud = 300;
+        if (baud <= 300)
+                baud = 300;
         else if (baud <= 600)      baud = 600;
         else if (baud <= 1200)     baud = 1200;
         else if (baud <= 1800)     baud = 1800;
@@ -389,10 +394,10 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
         else if (baud <= 491520)   baud = 460800;
         else if (baud <= 567138)   baud = 500000;
         else if (baud <= 670254)   baud = 576000;
-        else if (baud <= 1053257)  baud = 921600;
-        else if (baud <= 1474560)  baud = 1228800;
-        else if (baud <= 2457600)  baud = 1843200;
-        else                       baud = 3686400;
+        else if (baud < 1000000)
+                baud = 921600;
+        else if (baud > 2000000)
+                baud = 2000000;
         return baud;
 }
 
@@ -409,13 +414,14 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
                 return result;
         }
 
-        result = usb_serial_generic_open(tty, port);
-        if (result)
-                return result;
-
         /* Configure the termios structure */
         cp210x_get_termios(tty, port);
-        return 0;
+
+        /* The baud rate must be initialised on cp2104 */
+        if (tty)
+                cp210x_change_speed(tty, port, NULL);
+
+        return usb_serial_generic_open(tty, port);
 }
 
 static void cp210x_close(struct usb_serial_port *port)
@@ -467,10 +473,7 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
 
         dbg("%s - port %d", __func__, port->number);
 
-        cp210x_get_config(port, CP210X_GET_BAUDDIV, &baud, 2);
-        /* Convert to baudrate */
-        if (baud)
-                baud = cp210x_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud);
+        cp210x_get_config(port, CP210X_GET_BAUDRATE, &baud, 4);
 
         dbg("%s - baud rate = %d", __func__, baud);
         *baudp = baud;
@@ -579,11 +582,64 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
         *cflagp = cflag;
 }
 
+/*
+ * CP2101 supports the following baud rates:
+ *
+ *      300, 600, 1200, 1800, 2400, 4800, 7200, 9600, 14400, 19200, 28800,
+ *      38400, 56000, 57600, 115200, 128000, 230400, 460800, 921600
+ *
+ * CP2102 and CP2103 support the following additional rates:
+ *
+ *      4000, 16000, 51200, 64000, 76800, 153600, 250000, 256000, 500000,
+ *      576000
+ *
+ * The device will map a requested rate to a supported one, but the result
+ * of requests for rates greater than 1053257 is undefined (see AN205).
+ *
+ * CP2104, CP2105 and CP2110 support most rates up to 2M, 921k and 1M baud,
+ * respectively, with an error less than 1%. The actual rates are determined
+ * by
+ *
+ *      div = round(freq / (2 x prescale x request))
+ *      actual = freq / (2 x prescale x div)
+ *
+ * For CP2104 and CP2105 freq is 48Mhz and prescale is 4 for request <= 365bps
+ * or 1 otherwise.
+ * For CP2110 freq is 24Mhz and prescale is 4 for request <= 300bps or 1
+ * otherwise.
+ */
+static void cp210x_change_speed(struct tty_struct *tty,
+                struct usb_serial_port *port, struct ktermios *old_termios)
+{
+        u32 baud;
+
+        baud = tty->termios->c_ospeed;
+
+        /* This maps the requested rate to a rate valid on cp2102 or cp2103,
+         * or to an arbitrary rate in [1M,2M].
+         *
+         * NOTE: B0 is not implemented.
+         */
+        baud = cp210x_quantise_baudrate(baud);
+
+        dbg("%s - setting baud rate to %u", __func__, baud);
+        if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud,
+                                                        sizeof(baud))) {
+                dev_warn(&port->dev, "failed to set baud rate to %u\n", baud);
+                if (old_termios)
+                        baud = old_termios->c_ospeed;
+                else
+                        baud = 9600;
+        }
+
+        tty_encode_baud_rate(tty, baud, baud);
+}
+
 static void cp210x_set_termios(struct tty_struct *tty,
                 struct usb_serial_port *port, struct ktermios *old_termios)
 {
         unsigned int cflag, old_cflag;
-        unsigned int baud = 0, bits;
+        unsigned int bits;
         unsigned int modem_ctl[4];
 
         dbg("%s - port %d", __func__, port->number);
@@ -593,20 +649,9 @@ static void cp210x_set_termios(struct tty_struct *tty,
 
         cflag = tty->termios->c_cflag;
         old_cflag = old_termios->c_cflag;
-        baud = cp210x_quantise_baudrate(tty_get_baud_rate(tty));
-
-        /* If the baud rate is to be updated*/
-        if (baud != tty_termios_baud_rate(old_termios) && baud != 0) {
-                dbg("%s - Setting baud rate to %d baud", __func__,
-                                baud);
-                if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV,
-                                        ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) {
-                        dbg("Baud rate requested not supported by device");
-                        baud = tty_termios_baud_rate(old_termios);
-                }
-        }
-        /* Report back the resulting baud rate */
-        tty_encode_baud_rate(tty, baud, baud);
+
+        if (tty->termios->c_ospeed != old_termios->c_ospeed)
+                cp210x_change_speed(tty, port, old_termios);
 
         /* If the number of data bits is to be updated */
         if ((cflag & CSIZE) != (old_cflag & CSIZE)) {
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 01b6404df395..ad654f8208ef 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -797,6 +797,7 @@ static struct usb_device_id id_table_combined [] = {
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(HORNBY_VID, HORNBY_ELITE_PID) },
         { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
         { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
@@ -805,6 +806,8 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
         { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(FTDI_VID, TI_XDS100V2_PID),
+                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
         { USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) },
         { USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) },
@@ -841,6 +844,7 @@ static struct usb_device_id id_table_combined [] = {
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(ST_VID, ST_STMCLT1030_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },
+        { USB_DEVICE(FTDI_VID, FTDI_RF_R106) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
@@ -1333,8 +1337,7 @@ static int set_serial_info(struct tty_struct *tty,
                 goto check_and_exit;
         }
 
-        if ((new_serial.baud_base != priv->baud_base) &&
-            (new_serial.baud_base < 9600)) {
+        if (new_serial.baud_base != priv->baud_base) {
                 mutex_unlock(&priv->cfg_lock);
                 return -EINVAL;
         }
@@ -1824,6 +1827,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port)
 
 static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
+        struct ktermios dummy;
         struct usb_device *dev = port->serial->dev;
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         int result;
@@ -1842,8 +1846,10 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
            This is same behaviour as serial.c/rs_open() - Kuba */
 
         /* ftdi_set_termios  will send usb control messages */
-        if (tty)
-                ftdi_set_termios(tty, port, tty->termios);
+        if (tty) {
+                memset(&dummy, 0, sizeof(dummy));
+                ftdi_set_termios(tty, port, &dummy);
+        }
 
         /* Start reading from the device */
         result = usb_serial_generic_open(tty, port);
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index df1d7da933ec..f994503df2dd 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -39,6 +39,13 @@
 /* www.candapter.com Ewert Energy Systems CANdapter device */
 #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
 
+/*
+ * Texas Instruments XDS100v2 JTAG / BeagleBone A3
+ * http://processors.wiki.ti.com/index.php/XDS100
+ * http://beagleboard.org/bone
+ */
+#define TI_XDS100V2_PID         0xa6d0
+
 #define FTDI_NXTCAM_PID         0xABB8 /* NXTCam for Mindstorms NXT */
 
 /* US Interface Navigator (http://www.usinterface.com/) */
@@ -525,6 +532,12 @@
 #define ADI_GNICEPLUS_PID       0xF001
 
 /*
+ * Hornby Elite
+ */
+#define HORNBY_VID              0x04D8
+#define HORNBY_ELITE_PID        0x000A
+
+/*
  * RATOC REX-USB60F
  */
 #define RATOC_VENDOR_ID         0x0584
@@ -1168,3 +1181,9 @@
  */
 /* TagTracer MIFARE*/
 #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID    0xF7C0
+
+/*
+ * Rainforest Automation
+ */
+/* ZigBee controller */
+#define FTDI_RF_R106            0x8A28
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 65bf06aa591a..5818bfc3261e 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2657,15 +2657,7 @@ cleanup:
 
 static void edge_disconnect(struct usb_serial *serial)
 {
-        int i;
-        struct edgeport_port *edge_port;
-
         dbg("%s", __func__);
-
-        for (i = 0; i < serial->num_ports; ++i) {
-                edge_port = usb_get_serial_port_data(serial->port[i]);
-                edge_remove_sysfs_attrs(edge_port->port);
-        }
 }
 
 static void edge_release(struct usb_serial *serial)
@@ -2744,6 +2736,7 @@ static struct usb_serial_driver edgeport_1port_device = {
         .disconnect             = edge_disconnect,
         .release                = edge_release,
         .port_probe             = edge_create_sysfs_attrs,
+        .port_remove            = edge_remove_sysfs_attrs,
         .ioctl                  = edge_ioctl,
         .set_termios            = edge_set_termios,
         .tiocmget               = edge_tiocmget,
@@ -2775,6 +2768,7 @@ static struct usb_serial_driver edgeport_2port_device = {
         .disconnect             = edge_disconnect,
         .release                = edge_release,
         .port_probe             = edge_create_sysfs_attrs,
+        .port_remove            = edge_remove_sysfs_attrs,
         .ioctl                  = edge_ioctl,
         .set_termios            = edge_set_termios,
         .tiocmget               = edge_tiocmget,
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 5d3beeeb5fd9..a92a3efb507b 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -38,7 +38,7 @@
 #include <linux/ioctl.h>
 #include "kobil_sct.h"
 
-static int debug;
+static bool debug;
 
 /* Version Information */
 #define DRIVER_VERSION "21/05/2004"
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 420d9857394a..ea126a4490cd 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -480,6 +480,10 @@ static void option_instat_callback(struct urb *urb);
 #define ZD_VENDOR_ID                            0x0685
 #define ZD_PRODUCT_7000                         0x7000
 
+/* LG products */
+#define LG_VENDOR_ID                            0x1004
+#define LG_PRODUCT_L02C                         0x618f
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -1183,6 +1187,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) },
         { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) },
+        { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index 30b73e68a904..a34819884c1a 100644
--- a/drivers/usb/serial/qcaux.c
+++ b/drivers/usb/serial/qcaux.c
@@ -36,6 +36,7 @@
 #define UTSTARCOM_PRODUCT_UM175_V1              0x3712
 #define UTSTARCOM_PRODUCT_UM175_V2              0x3714
 #define UTSTARCOM_PRODUCT_UM175_ALLTEL          0x3715
+#define PANTECH_PRODUCT_UML190_VZW              0x3716
 #define PANTECH_PRODUCT_UML290_VZW              0x3718
 
 /* CMOTECH devices */
@@ -67,7 +68,11 @@ static struct usb_device_id id_table[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(LG_VENDOR_ID, LG_PRODUCT_VX4400_6000, 0xff, 0xff, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(SANYO_VENDOR_ID, SANYO_PRODUCT_KATANA_LX, 0xff, 0xff, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_U520, 0xff, 0x00, 0x00) },
-        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xfe, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfd, 0xff) },  /* NMEA */
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfe, 0xff) },  /* WMC */
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) },  /* DIAG */
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 1f62723ef1a8..d32f72061c09 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -789,7 +789,7 @@ static void rts51x_suspend_timer_fn(unsigned long data)
                         rts51x_set_stat(chip, RTS51X_STAT_SS);
                         /* ignore mass storage interface's children */
                         pm_suspend_ignore_children(&us->pusb_intf->dev, true);
-                        usb_autopm_put_interface(us->pusb_intf);
+                        usb_autopm_put_interface_async(us->pusb_intf);
                         US_DEBUGP("%s: RTS51X_STAT_SS 01,"
                                 "intf->pm_usage_cnt:%d, power.usage:%d\n",
                                 __func__,
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 8efeae24764f..b4a71679c933 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -27,8 +27,6 @@
 #define USB_SKEL_VENDOR_ID      0xfff0
 #define USB_SKEL_PRODUCT_ID     0xfff0
 
-static DEFINE_MUTEX(skel_mutex);
-
 /* table of devices that work with this driver */
 static const struct usb_device_id skel_table[] = {
         { USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) },
@@ -101,25 +99,18 @@ static int skel_open(struct inode *inode, struct file *file)
                 goto exit;
         }
 
-        mutex_lock(&skel_mutex);
         dev = usb_get_intfdata(interface);
         if (!dev) {
-                mutex_unlock(&skel_mutex);
                 retval = -ENODEV;
                 goto exit;
         }
 
         /* increment our usage count for the device */
         kref_get(&dev->kref);
-        mutex_unlock(&skel_mutex);
 
         /* lock the device to allow correctly handling errors
          * in resumption */
         mutex_lock(&dev->io_mutex);
-        if (!dev->interface) {
-                retval = -ENODEV;
-                goto out_err;
-        }
 
         retval = usb_autopm_get_interface(interface);
         if (retval)
@@ -127,11 +118,7 @@ static int skel_open(struct inode *inode, struct file *file)
 
         /* save our object in the file's private structure */
         file->private_data = dev;
-
-out_err:
         mutex_unlock(&dev->io_mutex);
-        if (retval)
-                kref_put(&dev->kref, skel_delete);
 
 exit:
         return retval;
@@ -611,6 +598,7 @@ static void skel_disconnect(struct usb_interface *interface)
         int minor = interface->minor;
 
         dev = usb_get_intfdata(interface);
+        usb_set_intfdata(interface, NULL);
 
         /* give back our minor */
         usb_deregister_dev(interface, &skel_class);
@@ -622,12 +610,8 @@ static void skel_disconnect(struct usb_interface *interface)
 
         usb_kill_anchored_urbs(&dev->submitted);
 
-        mutex_lock(&skel_mutex);
-        usb_set_intfdata(interface, NULL);
-
         /* decrement our usage count */
         kref_put(&dev->kref, skel_delete);
-        mutex_unlock(&skel_mutex);
 
         dev_info(&interface->dev, "USB Skeleton #%d now disconnected", minor);
 }
diff --git a/drivers/usb/wusbcore/Kconfig b/drivers/usb/wusbcore/Kconfig
index 0ead8826ec79..f29fdd7f6d75 100644
--- a/drivers/usb/wusbcore/Kconfig
+++ b/drivers/usb/wusbcore/Kconfig
@@ -6,7 +6,7 @@ config USB_WUSB
         depends on EXPERIMENTAL
         depends on USB
         depends on PCI
-        select UWB
+        depends on UWB
         select CRYPTO
         select CRYPTO_BLKCIPHER
         select CRYPTO_CBC
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 0d7b20d4285d..e40c00f2c2ba 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1108,7 +1108,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
          */
         lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
 
-        sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
+        sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR);
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(0);
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index acf292bfba02..6af3f16754f0 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1432,7 +1432,7 @@ static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state)
         struct fsl_diu_data *data;
 
         data = dev_get_drvdata(&ofdev->dev);
-        disable_lcdc(data->fsl_diu_info[0]);
+        disable_lcdc(data->fsl_diu_info);
 
         return 0;
 }
@@ -1442,7 +1442,7 @@ static int fsl_diu_resume(struct platform_device *ofdev)
         struct fsl_diu_data *data;
 
         data = dev_get_drvdata(&ofdev->dev);
-        enable_lcdc(data->fsl_diu_info[0]);
+        enable_lcdc(data->fsl_diu_info);
 
         return 0;
 }
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index c6afa33a4532..02fd2263610c 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -529,7 +529,6 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
         if (fb_alloc_cmap(&info->cmap, 256, 1) < 0) {
                 ERR_MSG("Could not allocate cmap for intelfb_info.\n");
                 goto err_out_cmap;
-                return -ENODEV;
         }
 
         dinfo = info->par;
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index a5ec7f37c185..e1626a1d5c45 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -401,7 +401,7 @@ void dispc_runtime_put(void)
 
         DSSDBG("dispc_runtime_put\n");
 
-        r = pm_runtime_put(&dispc.pdev->dev);
+        r = pm_runtime_put_sync(&dispc.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index d4d676c82c12..52f36ec1c8bb 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1079,7 +1079,7 @@ void dsi_runtime_put(struct platform_device *dsidev)
 
         DSSDBG("dsi_runtime_put\n");
 
-        r = pm_runtime_put(&dsi->pdev->dev);
+        r = pm_runtime_put_sync(&dsi->pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 17033457ee89..77c2b5a32b5d 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -720,7 +720,7 @@ void dss_runtime_put(void)
 
         DSSDBG("dss_runtime_put\n");
 
-        r = pm_runtime_put(&dss.pdev->dev);
+        r = pm_runtime_put_sync(&dss.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index b4c270edb915..d7aa3b056529 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -176,7 +176,7 @@ static void hdmi_runtime_put(void)
 
         DSSDBG("hdmi_runtime_put\n");
 
-        r = pm_runtime_put(&hdmi.pdev->dev);
+        r = pm_runtime_put_sync(&hdmi.pdev->dev);
         WARN_ON(r < 0);
 }
 
@@ -497,6 +497,7 @@ bool omapdss_hdmi_detect(void)
 
 int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
 {
+        struct omap_dss_hdmi_data *priv = dssdev->data;
         int r = 0;
 
         DSSDBG("ENTER hdmi_display_enable\n");
@@ -509,6 +510,8 @@ int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
                 goto err0;
         }
 
+        hdmi.ip_data.hpd_gpio = priv->hpd_gpio;
+
         r = omap_dss_start_device(dssdev);
         if (r) {
                 DSSERR("failed to start device\n");
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 814bb9500dca..55f398014f33 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -140,7 +140,7 @@ static void rfbi_runtime_put(void)
 
         DSSDBG("rfbi_runtime_put\n");
 
-        r = pm_runtime_put(&rfbi.pdev->dev);
+        r = pm_runtime_put_sync(&rfbi.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
index 7503f7f619a7..50dadba5070a 100644
--- a/drivers/video/omap2/dss/ti_hdmi.h
+++ b/drivers/video/omap2/dss/ti_hdmi.h
@@ -126,6 +126,10 @@ struct hdmi_ip_data {
         const struct ti_hdmi_ip_ops *ops;
         struct hdmi_config cfg;
         struct hdmi_pll_info pll_data;
+
+        /* ti_hdmi_4xxx_ip private data. These should be in a separate struct */
+        int hpd_gpio;
+        bool phy_tx_enabled;
 };
 int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);
 void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index 9af81f18f163..2d72334ca3da 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/seq_file.h>
+#include <linux/gpio.h>
 
 #include "ti_hdmi_4xxx_ip.h"
 #include "dss.h"
@@ -223,6 +224,49 @@ void ti_hdmi_4xxx_pll_disable(struct hdmi_ip_data *ip_data)
         hdmi_set_pll_pwr(ip_data, HDMI_PLLPWRCMD_ALLOFF);
 }
 
+static int hdmi_check_hpd_state(struct hdmi_ip_data *ip_data)
+{
+        unsigned long flags;
+        bool hpd;
+        int r;
+        /* this should be in ti_hdmi_4xxx_ip private data */
+        static DEFINE_SPINLOCK(phy_tx_lock);
+
+        spin_lock_irqsave(&phy_tx_lock, flags);
+
+        hpd = gpio_get_value(ip_data->hpd_gpio);
+
+        if (hpd == ip_data->phy_tx_enabled) {
+                spin_unlock_irqrestore(&phy_tx_lock, flags);
+                return 0;
+        }
+
+        if (hpd)
+                r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_TXON);
+        else
+                r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_LDOON);
+
+        if (r) {
+                DSSERR("Failed to %s PHY TX power\n",
+                                hpd ? "enable" : "disable");
+                goto err;
+        }
+
+        ip_data->phy_tx_enabled = hpd;
+err:
+        spin_unlock_irqrestore(&phy_tx_lock, flags);
+        return r;
+}
+
+static irqreturn_t hpd_irq_handler(int irq, void *data)
+{
+        struct hdmi_ip_data *ip_data = data;
+
+        hdmi_check_hpd_state(ip_data);
+
+        return IRQ_HANDLED;
+}
+
 int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
 {
         u16 r = 0;
@@ -232,10 +276,6 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
         if (r)
                 return r;
 
-        r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_TXON);
-        if (r)
-                return r;
-
         /*
          * Read address 0 in order to get the SCP reset done completed
          * Dummy access performed to make sure reset is done
@@ -257,12 +297,32 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
         /* Write to phy address 3 to change the polarity control */
         REG_FLD_MOD(phy_base, HDMI_TXPHY_PAD_CFG_CTRL, 0x1, 27, 27);
 
+        r = request_threaded_irq(gpio_to_irq(ip_data->hpd_gpio),
+                        NULL, hpd_irq_handler,
+                        IRQF_DISABLED | IRQF_TRIGGER_RISING |
+                        IRQF_TRIGGER_FALLING, "hpd", ip_data);
+        if (r) {
+                DSSERR("HPD IRQ request failed\n");
+                hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+                return r;
+        }
+
+        r = hdmi_check_hpd_state(ip_data);
+        if (r) {
+                free_irq(gpio_to_irq(ip_data->hpd_gpio), ip_data);
+                hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+                return r;
+        }
+
         return 0;
 }
 
 void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data)
 {
+        free_irq(gpio_to_irq(ip_data->hpd_gpio), ip_data);
+
         hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+        ip_data->phy_tx_enabled = false;
 }
 
 static int hdmi_core_ddc_init(struct hdmi_ip_data *ip_data)
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index b3e9f9091581..5c3d0f901510 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -401,7 +401,7 @@ static void venc_runtime_put(void)
 
         DSSDBG("venc_runtime_put\n");
 
-        r = pm_runtime_put(&venc.pdev->dev);
+        r = pm_runtime_put_sync(&venc.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 79e1b292c030..5aa43c3392a2 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -35,7 +35,7 @@
 #define virtio_rmb(vq) \
         do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0)
 #define virtio_wmb(vq) \
-        do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0)
+        do { if ((vq)->weak_barriers) smp_wmb(); else wmb(); } while(0)
 #else
 /* We must force memory ordering even if guest is UP since host could be
  * running on another CPU, but SMP barriers are defined to barrier() in that
@@ -308,9 +308,9 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq)
         bool needs_kick;
 
         START_USE(vq);
-        /* Descriptors and available array need to be set before we expose the
-         * new available array entries. */
-        virtio_wmb(vq);
+        /* We need to expose available array entries before checking avail
+         * event. */
+        virtio_mb(vq);
 
         old = vq->vring.avail->idx - vq->num_added;
         new = vq->vring.avail->idx;
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 1b0e3dd81c1a..63d7b58f1c7d 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -300,11 +300,7 @@ static int __devinit dw_wdt_drv_probe(struct platform_device *pdev)
         if (!mem)
                 return -EINVAL;
 
-        if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),
-                                     "dw_wdt"))
-                return -ENOMEM;
-
-        dw_wdt.regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
+        dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem);
         if (!dw_wdt.regs)
                 return -ENOMEM;
 
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 99796c5d913d..bdf401b240b5 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -36,6 +36,7 @@
  *      document number TBD                   : Patsburg (PBG)
  *      document number TBD                   : DH89xxCC
  *      document number TBD                   : Panther Point
+ *      document number TBD                   : Lynx Point
  */
 
 /*
@@ -126,6 +127,7 @@ enum iTCO_chipsets {
         TCO_PBG,        /* Patsburg */
         TCO_DH89XXCC,   /* DH89xxCC */
         TCO_PPT,        /* Panther Point */
+        TCO_LPT,        /* Lynx Point */
 };
 
 static struct {
@@ -189,6 +191,7 @@ static struct {
         {"Patsburg", 2},
         {"DH89xxCC", 2},
         {"Panther Point", 2},
+        {"Lynx Point", 2},
         {NULL, 0}
 };
 
@@ -331,6 +334,38 @@ static DEFINE_PCI_DEVICE_TABLE(iTCO_wdt_pci_tbl) = {
         { PCI_VDEVICE(INTEL, 0x1e5d), TCO_PPT},
         { PCI_VDEVICE(INTEL, 0x1e5e), TCO_PPT},
         { PCI_VDEVICE(INTEL, 0x1e5f), TCO_PPT},
+        { PCI_VDEVICE(INTEL, 0x8c40), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c41), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c42), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c43), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c44), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c45), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c46), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c47), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c48), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c49), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4a), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4b), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4c), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4d), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4e), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4f), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c50), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c51), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c52), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c53), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c54), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c55), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c56), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c57), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c58), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c59), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5a), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5b), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5c), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5d), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5e), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5f), TCO_LPT},
         { 0, },                 /* End of list */
 };
 MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index b8ef2c6dca7c..c44c3334003a 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -247,7 +247,6 @@ static struct miscdevice imx2_wdt_miscdev = {
 static int __init imx2_wdt_probe(struct platform_device *pdev)
 {
         int ret;
-        int res_size;
         struct resource *res;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -256,15 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        res_size = resource_size(res);
-        if (!devm_request_mem_region(&pdev->dev, res->start, res_size,
-                res->name)) {
-                dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n",
-                        res_size, res->start);
-                return -ENOMEM;
-        }
-
-        imx2_wdt.base = devm_ioremap_nocache(&pdev->dev, res->start, res_size);
+        imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res);
         if (!imx2_wdt.base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 return -ENOMEM;
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index 50359bad9177..529085b8b8fb 100644
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -72,7 +72,7 @@ struct nuc900_wdt {
 };
 
 static unsigned long nuc900wdt_busy;
-struct nuc900_wdt *nuc900_wdt;
+static struct nuc900_wdt *nuc900_wdt;
 
 static inline void nuc900_wdt_keepalive(void)
 {
@@ -287,7 +287,8 @@ static int __devinit nuc900wdt_probe(struct platform_device *pdev)
 
         setup_timer(&nuc900_wdt->timer, nuc900_wdt_timer_ping, 0);
 
-        if (misc_register(&nuc900wdt_miscdev)) {
+        ret = misc_register(&nuc900wdt_miscdev);
+        if (ret) {
                 dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
                         WATCHDOG_MINOR, ret);
                 goto err_clk;
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 4b33e3fd726b..d19ff5145e82 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -339,6 +339,7 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
         return 0;
 
 err_misc:
+        pm_runtime_disable(wdev->dev);
         platform_set_drvdata(pdev, NULL);
         iounmap(wdev->base);
 
@@ -371,6 +372,7 @@ static int __devexit omap_wdt_remove(struct platform_device *pdev)
         struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
         struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
+        pm_runtime_disable(wdev->dev);
         if (!res)
                 return -ENOENT;
 
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index bd143c9dd3e6..8e210aafdfd0 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -226,7 +226,7 @@ static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,
 static int pnx4008_wdt_release(struct inode *inode, struct file *file)
 {
         if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status))
-                printk(KERN_WARNING "WATCHDOG: Device closed unexpectdly\n");
+                printk(KERN_WARNING "WATCHDOG: Device closed unexpectedly\n");
 
         wdt_disable();
         clk_disable(wdt_clk);
diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
index 4c2a4e8698f9..e37d81178b9e 100644
--- a/drivers/watchdog/stmp3xxx_wdt.c
+++ b/drivers/watchdog/stmp3xxx_wdt.c
@@ -174,7 +174,7 @@ static int stmp3xxx_wdt_release(struct inode *inode, struct file *file)
         if (!nowayout) {
                 if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) {
                         wdt_ping();
-                        pr_debug("%s: Device closed unexpectdly\n", __func__);
+                        pr_debug("%s: Device closed unexpectedly\n", __func__);
                         ret = -EINVAL;
                 } else {
                         wdt_disable();
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index 026b4bbfa0aa..8f07dd4bd94a 100644
--- a/drivers/watchdog/via_wdt.c
+++ b/drivers/watchdog/via_wdt.c
@@ -124,8 +124,6 @@ static int wdt_stop(struct watchdog_device *wdd)
 static int wdt_set_timeout(struct watchdog_device *wdd,
                            unsigned int new_timeout)
 {
-        if (new_timeout < 1 || new_timeout > WDT_TIMEOUT_MAX)
-                return -EINVAL;
         writel(new_timeout, wdt_mem + VIA_WDT_COUNT);
         timeout = new_timeout;
         return 0;
@@ -150,6 +148,8 @@ static const struct watchdog_ops wdt_ops = {
 static struct watchdog_device wdt_dev = {
         .info =         &wdt_info,
         .ops =          &wdt_ops,
+        .min_timeout =  1,
+        .max_timeout =  WDT_TIMEOUT_MAX,
 };
 
 static int __devinit wdt_probe(struct pci_dev *pdev,
@@ -233,7 +233,7 @@ static void __devexit wdt_remove(struct pci_dev *pdev)
         pci_disable_device(pdev);
 }
 
-DEFINE_PCI_DEVICE_TABLE(wdt_pci_table) = {
+static DEFINE_PCI_DEVICE_TABLE(wdt_pci_table) = {
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CX700) },
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800) },
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 42e940c23891..c3c3188c34d7 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -152,12 +152,12 @@ static long wafwdt_ioctl(struct file *file, unsigned int cmd,
                         return -EFAULT;
 
                 if (options & WDIOS_DISABLECARD) {
-                        wafwdt_start();
+                        wafwdt_stop();
                         retval = 0;
                 }
 
                 if (options & WDIOS_ENABLECARD) {
-                        wafwdt_stop();
+                        wafwdt_start();
                         retval = 0;
                 }
 
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c
index 909c78650d3e..5d7113c7e501 100644
--- a/drivers/watchdog/wm8350_wdt.c
+++ b/drivers/watchdog/wm8350_wdt.c
@@ -212,10 +212,10 @@ static long wm8350_wdt_ioctl(struct file *file, unsigned int cmd,
 
                 /* Setting both simultaneously means at least one must fail */
                 if (options == WDIOS_DISABLECARD)
-                        ret = wm8350_wdt_start(wm8350);
+                        ret = wm8350_wdt_stop(wm8350);
 
                 if (options == WDIOS_ENABLECARD)
-                        ret = wm8350_wdt_stop(wm8350);
+                        ret = wm8350_wdt_start(wm8350);
                 break;
         }
 
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 1cd94daa71db..b4d4eac761db 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -948,9 +948,12 @@ static void gnttab_request_version(void)
         int rc;
         struct gnttab_set_version gsv;
 
-        gsv.version = 2;
+        if (xen_hvm_domain())
+                gsv.version = 1;
+        else
+                gsv.version = 2;
         rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1);
-        if (rc == 0) {
+        if (rc == 0 && gsv.version == 2) {
                 grant_table_version = 2;
                 gnttab_interface = &gnttab_v2_ops;
         } else if (grant_table_version == 2) {
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index b9a843226de8..633c701a287d 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -297,7 +297,7 @@ static int __add_delayed_refs(struct btrfs_delayed_ref_head *head, u64 seq,
         struct btrfs_delayed_extent_op *extent_op = head->extent_op;
         struct rb_node *n = &head->node.rb_node;
         int sgn;
-        int ret;
+        int ret = 0;
 
         if (extent_op && extent_op->update_key)
                 btrfs_disk_key_to_cpu(info_key, &extent_op->key);
@@ -392,7 +392,7 @@ static int __add_inline_refs(struct btrfs_fs_info *fs_info,
                              struct btrfs_key *info_key, int *info_level,
                              struct list_head *prefs)
 {
-        int ret;
+        int ret = 0;
         int slot;
         struct extent_buffer *leaf;
         struct btrfs_key key;
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index ad0b3ba735b7..b669a7d8e499 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -1662,7 +1662,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
         block = btrfsic_block_hashtable_lookup(bdev, dev_bytenr,
                                                &state->block_hashtable);
         if (NULL != block) {
-                u64 bytenr;
+                u64 bytenr = 0;
                 struct list_head *elem_ref_to;
                 struct list_head *tmp_ref_to;
 
@@ -2777,9 +2777,10 @@ int btrfsic_submit_bh(int rw, struct buffer_head *bh)
                         printk(KERN_INFO
                                "submit_bh(rw=0x%x, blocknr=%lu (bytenr %llu),"
                                " size=%lu, data=%p, bdev=%p)\n",
-                               rw, bh->b_blocknr,
-                               (unsigned long long)dev_bytenr, bh->b_size,
-                               bh->b_data, bh->b_bdev);
+                               rw, (unsigned long)bh->b_blocknr,
+                               (unsigned long long)dev_bytenr,
+                               (unsigned long)bh->b_size, bh->b_data,
+                               bh->b_bdev);
                 btrfsic_process_written_block(dev_state, dev_bytenr,
                                               bh->b_data, bh->b_size, NULL,
                                               NULL, bh, rw);
@@ -2844,7 +2845,7 @@ void btrfsic_submit_bio(int rw, struct bio *bio)
                         printk(KERN_INFO
                                "submit_bio(rw=0x%x, bi_vcnt=%u,"
                                " bi_sector=%lu (bytenr %llu), bi_bdev=%p)\n",
-                               rw, bio->bi_vcnt, bio->bi_sector,
+                               rw, bio->bi_vcnt, (unsigned long)bio->bi_sector,
                                (unsigned long long)dev_bytenr,
                                bio->bi_bdev);
 
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 7aa9cd36bf1b..811d9f918b1c 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -962,6 +962,13 @@ static int btree_releasepage(struct page *page, gfp_t gfp_flags)
         tree = &BTRFS_I(page->mapping->host)->io_tree;
         map = &BTRFS_I(page->mapping->host)->extent_tree;
 
+        /*
+         * We need to mask out eg. __GFP_HIGHMEM and __GFP_DMA32 as we're doing
+         * slab allocation from alloc_extent_state down the callchain where
+         * it'd hit a BUG_ON as those flags are not allowed.
+         */
+        gfp_flags &= ~GFP_SLAB_BUG_MASK;
+
         ret = try_release_extent_state(map, tree, page, gfp_flags);
         if (!ret)
                 return 0;
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 700879ed64cf..283af7a676a3 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -34,23 +34,24 @@
 #include "locking.h"
 #include "free-space-cache.h"
 
-/* control flags for do_chunk_alloc's force field
+/*
+ * control flags for do_chunk_alloc's force field
  * CHUNK_ALLOC_NO_FORCE means to only allocate a chunk
  * if we really need one.
  *
- * CHUNK_ALLOC_FORCE means it must try to allocate one
- *
  * CHUNK_ALLOC_LIMITED means to only try and allocate one
  * if we have very few chunks already allocated.  This is
  * used as part of the clustering code to help make sure
  * we have a good pool of storage to cluster in, without
  * filling the FS with empty chunks
  *
+ * CHUNK_ALLOC_FORCE means it must try to allocate one
+ *
  */
 enum {
         CHUNK_ALLOC_NO_FORCE = 0,
-        CHUNK_ALLOC_FORCE = 1,
-        CHUNK_ALLOC_LIMITED = 2,
+        CHUNK_ALLOC_LIMITED = 1,
+        CHUNK_ALLOC_FORCE = 2,
 };
 
 /*
@@ -3414,7 +3415,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
 
 again:
         spin_lock(&space_info->lock);
-        if (space_info->force_alloc)
+        if (force < space_info->force_alloc)
                 force = space_info->force_alloc;
         if (space_info->full) {
                 spin_unlock(&space_info->lock);
@@ -5794,6 +5795,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
                          u64 search_end, struct btrfs_key *ins,
                          u64 data)
 {
+        bool final_tried = false;
         int ret;
         u64 search_start = 0;
 
@@ -5813,22 +5815,25 @@ again:
                                search_start, search_end, hint_byte,
                                ins, data);
 
-        if (ret == -ENOSPC && num_bytes > min_alloc_size) {
-                num_bytes = num_bytes >> 1;
-                num_bytes = num_bytes & ~(root->sectorsize - 1);
-                num_bytes = max(num_bytes, min_alloc_size);
-                do_chunk_alloc(trans, root->fs_info->extent_root,
-                               num_bytes, data, CHUNK_ALLOC_FORCE);
-                goto again;
-        }
-        if (ret == -ENOSPC && btrfs_test_opt(root, ENOSPC_DEBUG)) {
-                struct btrfs_space_info *sinfo;
-
-                sinfo = __find_space_info(root->fs_info, data);
-                printk(KERN_ERR "btrfs allocation failed flags %llu, "
-                       "wanted %llu\n", (unsigned long long)data,
-                       (unsigned long long)num_bytes);
-                dump_space_info(sinfo, num_bytes, 1);
+        if (ret == -ENOSPC) {
+                if (!final_tried) {
+                        num_bytes = num_bytes >> 1;
+                        num_bytes = num_bytes & ~(root->sectorsize - 1);
+                        num_bytes = max(num_bytes, min_alloc_size);
+                        do_chunk_alloc(trans, root->fs_info->extent_root,
+                                       num_bytes, data, CHUNK_ALLOC_FORCE);
+                        if (num_bytes == min_alloc_size)
+                                final_tried = true;
+                        goto again;
+                } else if (btrfs_test_opt(root, ENOSPC_DEBUG)) {
+                        struct btrfs_space_info *sinfo;
+
+                        sinfo = __find_space_info(root->fs_info, data);
+                        printk(KERN_ERR "btrfs allocation failed flags %llu, "
+                               "wanted %llu\n", (unsigned long long)data,
+                               (unsigned long long)num_bytes);
+                        dump_space_info(sinfo, num_bytes, 1);
+                }
         }
 
         trace_btrfs_reserved_extent_alloc(root, ins->objectid, ins->offset);
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 9d09a4f81875..fcf77e1ded40 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3909,6 +3909,8 @@ int extent_range_uptodate(struct extent_io_tree *tree,
         while (start <= end) {
                 index = start >> PAGE_CACHE_SHIFT;
                 page = find_get_page(tree->mapping, index);
+                if (!page)
+                        return 1;
                 uptodate = PageUptodate(page);
                 page_cache_release(page);
                 if (!uptodate) {
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d20ff87ca603..c2f20594c9f7 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -2242,7 +2242,7 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
                 if (entry->bitmap) {
                         ret = btrfs_alloc_from_bitmap(block_group,
                                                       cluster, entry, bytes,
-                                                      min_start);
+                                                      cluster->window_start);
                         if (ret == 0) {
                                 node = rb_next(&entry->offset_index);
                                 if (!node)
@@ -2251,6 +2251,7 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
                                                  offset_index);
                                 continue;
                         }
+                        cluster->window_start += bytes;
                 } else {
                         ret = entry->offset;
 
@@ -2475,7 +2476,7 @@ setup_cluster_bitmap(struct btrfs_block_group_cache *block_group,
         }
 
         list_for_each_entry(entry, bitmaps, list) {
-                if (entry->bytes < min_bytes)
+                if (entry->bytes < bytes)
                         continue;
                 ret = btrfs_bitmap_cluster(block_group, entry, cluster, offset,
                                            bytes, cont1_bytes, min_bytes);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0da19a0ea00d..32214fe0f7e3 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6401,18 +6401,23 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
         unsigned long zero_start;
         loff_t size;
         int ret;
+        int reserved = 0;
         u64 page_start;
         u64 page_end;
 
         ret  = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE);
-        if (!ret)
+        if (!ret) {
                 ret = btrfs_update_time(vma->vm_file);
+                reserved = 1;
+        }
         if (ret) {
                 if (ret == -ENOMEM)
                         ret = VM_FAULT_OOM;
                 else /* -ENOSPC, -EIO, etc */
                         ret = VM_FAULT_SIGBUS;
-                goto out;
+                if (reserved)
+                        goto out;
+                goto out_noreserve;
         }
 
         ret = VM_FAULT_NOPAGE; /* make the VM retry the fault */
@@ -6495,6 +6500,7 @@ out_unlock:
         unlock_page(page);
 out:
         btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE);
+out_noreserve:
         return ret;
 }
 
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index ab620014bcc3..03bb62a9ee24 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1065,7 +1065,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
                 i = range->start >> PAGE_CACHE_SHIFT;
         }
         if (!max_to_defrag)
-                max_to_defrag = last_index;
+                max_to_defrag = last_index + 1;
 
         /*
          * make writeback starts from i, so the defrag range can be
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index cb877e0886a7..966cc74f5d6c 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1957,7 +1957,8 @@ static int wait_log_commit(struct btrfs_trans_handle *trans,
 
                 finish_wait(&root->log_commit_wait[index], &wait);
                 mutex_lock(&root->log_mutex);
-        } while (root->log_transid < transid + 2 &&
+        } while (root->fs_info->last_trans_log_full_commit !=
+                 trans->transid && root->log_transid < transid + 2 &&
                  atomic_read(&root->log_commit[index]));
         return 0;
 }
@@ -1966,7 +1967,8 @@ static int wait_for_writer(struct btrfs_trans_handle *trans,
                            struct btrfs_root *root)
 {
         DEFINE_WAIT(wait);
-        while (atomic_read(&root->log_writers)) {
+        while (root->fs_info->last_trans_log_full_commit !=
+               trans->transid && atomic_read(&root->log_writers)) {
                 prepare_to_wait(&root->log_writer_wait,
                                 &wait, TASK_UNINTERRUPTIBLE);
                 mutex_unlock(&root->log_mutex);
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index b60fc8bfb3e9..620daad201db 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -641,10 +641,10 @@ static int __cap_is_valid(struct ceph_cap *cap)
         unsigned long ttl;
         u32 gen;
 
-        spin_lock(&cap->session->s_cap_lock);
+        spin_lock(&cap->session->s_gen_ttl_lock);
         gen = cap->session->s_cap_gen;
         ttl = cap->session->s_cap_ttl;
-        spin_unlock(&cap->session->s_cap_lock);
+        spin_unlock(&cap->session->s_gen_ttl_lock);
 
         if (cap->cap_gen < gen || time_after_eq(jiffies, ttl)) {
                 dout("__cap_is_valid %p cap %p issued %s "
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 618246bc2196..3e8094be4604 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -975,10 +975,10 @@ static int dentry_lease_is_valid(struct dentry *dentry)
         di = ceph_dentry(dentry);
         if (di->lease_session) {
                 s = di->lease_session;
-                spin_lock(&s->s_cap_lock);
+                spin_lock(&s->s_gen_ttl_lock);
                 gen = s->s_cap_gen;
                 ttl = s->s_cap_ttl;
-                spin_unlock(&s->s_cap_lock);
+                spin_unlock(&s->s_gen_ttl_lock);
 
                 if (di->lease_gen == gen &&
                     time_before(jiffies, dentry->d_time) &&
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 23ab6a3f1825..866e8d7ca37d 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -262,6 +262,7 @@ static int parse_reply_info(struct ceph_msg *msg,
         /* trace */
         ceph_decode_32_safe(&p, end, len, bad);
         if (len > 0) {
+                ceph_decode_need(&p, end, len, bad);
                 err = parse_reply_info_trace(&p, p+len, info, features);
                 if (err < 0)
                         goto out_bad;
@@ -270,6 +271,7 @@ static int parse_reply_info(struct ceph_msg *msg,
         /* extra */
         ceph_decode_32_safe(&p, end, len, bad);
         if (len > 0) {
+                ceph_decode_need(&p, end, len, bad);
                 err = parse_reply_info_extra(&p, p+len, info, features);
                 if (err < 0)
                         goto out_bad;
@@ -398,9 +400,11 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc,
         s->s_con.peer_name.type = CEPH_ENTITY_TYPE_MDS;
         s->s_con.peer_name.num = cpu_to_le64(mds);
 
-        spin_lock_init(&s->s_cap_lock);
+        spin_lock_init(&s->s_gen_ttl_lock);
         s->s_cap_gen = 0;
         s->s_cap_ttl = 0;
+
+        spin_lock_init(&s->s_cap_lock);
         s->s_renew_requested = 0;
         s->s_renew_seq = 0;
         INIT_LIST_HEAD(&s->s_caps);
@@ -2326,10 +2330,10 @@ static void handle_session(struct ceph_mds_session *session,
         case CEPH_SESSION_STALE:
                 pr_info("mds%d caps went stale, renewing\n",
                         session->s_mds);
-                spin_lock(&session->s_cap_lock);
+                spin_lock(&session->s_gen_ttl_lock);
                 session->s_cap_gen++;
                 session->s_cap_ttl = 0;
-                spin_unlock(&session->s_cap_lock);
+                spin_unlock(&session->s_gen_ttl_lock);
                 send_renew_caps(mdsc, session);
                 break;
 
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index a50ca0e39475..8c7c04ebb595 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -117,10 +117,13 @@ struct ceph_mds_session {
         void             *s_authorizer_buf, *s_authorizer_reply_buf;
         size_t            s_authorizer_buf_len, s_authorizer_reply_buf_len;
 
-        /* protected by s_cap_lock */
-        spinlock_t        s_cap_lock;
+        /* protected by s_gen_ttl_lock */
+        spinlock_t        s_gen_ttl_lock;
         u32               s_cap_gen;  /* inc each time we get mds stale msg */
         unsigned long     s_cap_ttl;  /* when session caps expire */
+
+        /* protected by s_cap_lock */
+        spinlock_t        s_cap_lock;
         struct list_head  s_caps;     /* all caps issued by this session */
         int               s_nr_caps, s_trim_caps;
         int               s_num_cap_releases;
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 857214ae8c08..a76f697303d9 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -111,8 +111,10 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
 }
 
 static struct ceph_vxattr_cb ceph_file_vxattrs[] = {
+        { true, "ceph.file.layout", ceph_vxattrcb_layout},
+        /* The following extended attribute name is deprecated */
         { true, "ceph.layout", ceph_vxattrcb_layout},
-        { NULL, NULL }
+        { true, NULL, NULL }
 };
 
 static struct ceph_vxattr_cb *ceph_inode_vxattrs(struct inode *inode)
diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig
index 0554b00a7b33..2b243af70aa3 100644
--- a/fs/cifs/Kconfig
+++ b/fs/cifs/Kconfig
@@ -139,7 +139,7 @@ config CIFS_DFS_UPCALL
             points. If unsure, say N.
 
 config CIFS_FSCACHE
-          bool "Provide CIFS client caching support (EXPERIMENTAL)"
+          bool "Provide CIFS client caching support"
           depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y
           help
             Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data
@@ -147,7 +147,7 @@ config CIFS_FSCACHE
             manager. If unsure, say N.
 
 config CIFS_ACL
-          bool "Provide CIFS ACL support (EXPERIMENTAL)"
+          bool "Provide CIFS ACL support"
           depends on CIFS_XATTR && KEYS
           help
             Allows to fetch CIFS/NTFS ACL from the server.  The DACL blob
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 986709a8d903..9c288653e6d6 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2142,14 +2142,14 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
 
         len = delim - payload;
         if (len > MAX_USERNAME_SIZE || len <= 0) {
-                cFYI(1, "Bad value from username search (len=%ld)", len);
+                cFYI(1, "Bad value from username search (len=%zd)", len);
                 rc = -EINVAL;
                 goto out_key_put;
         }
 
         vol->username = kstrndup(payload, len, GFP_KERNEL);
         if (!vol->username) {
-                cFYI(1, "Unable to allocate %ld bytes for username", len);
+                cFYI(1, "Unable to allocate %zd bytes for username", len);
                 rc = -ENOMEM;
                 goto out_key_put;
         }
@@ -2157,7 +2157,7 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
 
         len = key->datalen - (len + 1);
         if (len > MAX_PASSWORD_SIZE || len <= 0) {
-                cFYI(1, "Bad len for password search (len=%ld)", len);
+                cFYI(1, "Bad len for password search (len=%zd)", len);
                 rc = -EINVAL;
                 kfree(vol->username);
                 vol->username = NULL;
@@ -2167,7 +2167,7 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
         ++delim;
         vol->password = kstrndup(delim, len, GFP_KERNEL);
         if (!vol->password) {
-                cFYI(1, "Unable to allocate %ld bytes for password", len);
+                cFYI(1, "Unable to allocate %zd bytes for password", len);
                 rc = -ENOMEM;
                 kfree(vol->username);
                 vol->username = NULL;
@@ -3857,10 +3857,8 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
         struct smb_vol *vol_info;
 
         vol_info = kzalloc(sizeof(*vol_info), GFP_KERNEL);
-        if (vol_info == NULL) {
-                tcon = ERR_PTR(-ENOMEM);
-                goto out;
-        }
+        if (vol_info == NULL)
+                return ERR_PTR(-ENOMEM);
 
         vol_info->local_nls = cifs_sb->local_nls;
         vol_info->linux_uid = fsuid;
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index d85efad5765f..551d0c2b9736 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -246,16 +246,15 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses,
         /* copy user */
         /* BB what about null user mounts - check that we do this BB */
         /* copy user */
-        if (ses->user_name != NULL)
+        if (ses->user_name != NULL) {
                 strncpy(bcc_ptr, ses->user_name, MAX_USERNAME_SIZE);
+                bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE);
+        }
         /* else null user mount */
-
-        bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE);
         *bcc_ptr = 0;
         bcc_ptr++; /* account for null termination */
 
         /* copy domain */
-
         if (ses->domainName != NULL) {
                 strncpy(bcc_ptr, ses->domainName, 256);
                 bcc_ptr += strnlen(ses->domainName, 256);
@@ -395,6 +394,10 @@ static int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len,
         ses->ntlmssp->server_flags = le32_to_cpu(pblob->NegotiateFlags);
         tioffset = le32_to_cpu(pblob->TargetInfoArray.BufferOffset);
         tilen = le16_to_cpu(pblob->TargetInfoArray.Length);
+        if (tioffset > blob_len || tioffset + tilen > blob_len) {
+                cERROR(1, "tioffset + tilen too high %u + %u", tioffset, tilen);
+                return -EINVAL;
+        }
         if (tilen) {
                 ses->auth_key.response = kmalloc(tilen, GFP_KERNEL);
                 if (!ses->auth_key.response) {
diff --git a/fs/exec.c b/fs/exec.c
index aeb135c7ff5c..92ce83a11e90 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1071,6 +1071,21 @@ void set_task_comm(struct task_struct *tsk, char *buf)
         perf_event_comm(tsk);
 }
 
+static void filename_to_taskname(char *tcomm, const char *fn, unsigned int len)
+{
+        int i, ch;
+
+        /* Copies the binary name from after last slash */
+        for (i = 0; (ch = *(fn++)) != '\0';) {
+                if (ch == '/')
+                        i = 0; /* overwrite what we wrote */
+                else
+                        if (i < len - 1)
+                                tcomm[i++] = ch;
+        }
+        tcomm[i] = '\0';
+}
+
 int flush_old_exec(struct linux_binprm * bprm)
 {
         int retval;
@@ -1085,6 +1100,7 @@ int flush_old_exec(struct linux_binprm * bprm)
 
         set_mm_exe_file(bprm->mm, bprm->file);
 
+        filename_to_taskname(bprm->tcomm, bprm->filename, sizeof(bprm->tcomm));
         /*
          * Release all of the old mmap stuff
          */
@@ -1116,10 +1132,6 @@ EXPORT_SYMBOL(would_dump);
 
 void setup_new_exec(struct linux_binprm * bprm)
 {
-        int i, ch;
-        const char *name;
-        char tcomm[sizeof(current->comm)];
-
         arch_pick_mmap_layout(current->mm);
 
         /* This is the point of no return */
@@ -1130,18 +1142,7 @@ void setup_new_exec(struct linux_binprm * bprm)
         else
                 set_dumpable(current->mm, suid_dumpable);
 
-        name = bprm->filename;
-
-        /* Copies the binary name from after last slash */
-        for (i=0; (ch = *(name++)) != '\0';) {
-                if (ch == '/')
-                        i = 0; /* overwrite what we wrote */
-                else
-                        if (i < (sizeof(tcomm) - 1))
-                                tcomm[i++] = ch;
-        }
-        tcomm[i] = '\0';
-        set_task_comm(current, tcomm);
+        set_task_comm(current, bprm->tcomm);
 
         /* Set the new mm task size. We have to do that late because it may
          * depend on TIF_32BIT which is only updated in flush_thread() on
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index a01cdad6aad1..eafb8d37a6fb 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -335,7 +335,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl
         void *ebuf;
         uint32_t ofs;
         size_t retlen;
-        int ret = -EIO;
+        int ret;
         unsigned long *wordebuf;
 
         ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen,
diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c
index e97404d611e0..9c501449450d 100644
--- a/fs/logfs/dev_mtd.c
+++ b/fs/logfs/dev_mtd.c
@@ -152,9 +152,6 @@ static struct page *logfs_mtd_find_first_sb(struct super_block *sb, u64 *ofs)
         filler_t *filler = logfs_mtd_readpage;
         struct mtd_info *mtd = super->s_mtd;
 
-        if (!mtd_can_have_bb(mtd))
-                return NULL;
-
         *ofs = 0;
         while (mtd_block_isbad(mtd, *ofs)) {
                 *ofs += mtd->erasesize;
@@ -172,9 +169,6 @@ static struct page *logfs_mtd_find_last_sb(struct super_block *sb, u64 *ofs)
         filler_t *filler = logfs_mtd_readpage;
         struct mtd_info *mtd = super->s_mtd;
 
-        if (!mtd_can_have_bb(mtd))
-                return NULL;
-
         *ofs = mtd->size - mtd->erasesize;
         while (mtd_block_isbad(mtd, *ofs)) {
                 *ofs -= mtd->erasesize;
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index 501043e8966c..3de7a32cadbe 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -71,7 +71,7 @@ static int write_dir(struct inode *dir, struct logfs_disk_dentry *dd,
 
 static int write_inode(struct inode *inode)
 {
-        return __logfs_write_inode(inode, WF_LOCK);
+        return __logfs_write_inode(inode, NULL, WF_LOCK);
 }
 
 static s64 dir_seek_data(struct inode *inode, s64 pos)
diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index b548c87a86f1..3886cded283c 100644
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -230,7 +230,9 @@ int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
                 return ret;
 
         mutex_lock(&inode->i_mutex);
+        logfs_get_wblocks(sb, NULL, WF_LOCK);
         logfs_write_anchor(sb);
+        logfs_put_wblocks(sb, NULL, WF_LOCK);
         mutex_unlock(&inode->i_mutex);
 
         return 0;
diff --git a/fs/logfs/gc.c b/fs/logfs/gc.c
index caa4419285dc..d4efb061bdc5 100644
--- a/fs/logfs/gc.c
+++ b/fs/logfs/gc.c
@@ -367,7 +367,7 @@ static struct gc_candidate *get_candidate(struct super_block *sb)
         int i, max_dist;
         struct gc_candidate *cand = NULL, *this;
 
-        max_dist = min(no_free_segments(sb), LOGFS_NO_AREAS);
+        max_dist = min(no_free_segments(sb), LOGFS_NO_AREAS - 1);
 
         for (i = max_dist; i >= 0; i--) {
                 this = first_in_list(&super->s_low_list[i]);
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
index 388df1aa35e5..a422f42238b2 100644
--- a/fs/logfs/inode.c
+++ b/fs/logfs/inode.c
@@ -286,7 +286,7 @@ static int logfs_write_inode(struct inode *inode, struct writeback_control *wbc)
         if (logfs_inode(inode)->li_flags & LOGFS_IF_STILLBORN)
                 return 0;
 
-        ret = __logfs_write_inode(inode, flags);
+        ret = __logfs_write_inode(inode, NULL, flags);
         LOGFS_BUG_ON(ret, inode->i_sb);
         return ret;
 }
@@ -363,7 +363,9 @@ static void logfs_init_once(void *_li)
 
 static int logfs_sync_fs(struct super_block *sb, int wait)
 {
+        logfs_get_wblocks(sb, NULL, WF_LOCK);
         logfs_write_anchor(sb);
+        logfs_put_wblocks(sb, NULL, WF_LOCK);
         return 0;
 }
 
diff --git a/fs/logfs/journal.c b/fs/logfs/journal.c
index 9da29706f91c..1e1c369df22b 100644
--- a/fs/logfs/journal.c
+++ b/fs/logfs/journal.c
@@ -612,7 +612,6 @@ static size_t __logfs_write_je(struct super_block *sb, void *buf, u16 type,
         if (len == 0)
                 return logfs_write_header(super, header, 0, type);
 
-        BUG_ON(len > sb->s_blocksize);
         compr_len = logfs_compress(buf, data, len, sb->s_blocksize);
         if (compr_len < 0 || type == JE_ANCHOR) {
                 memcpy(data, buf, len);
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index 926373866a55..5f0937609465 100644
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -528,7 +528,7 @@ void logfs_destroy_inode_cache(void);
 void logfs_set_blocks(struct inode *inode, u64 no);
 /* these logically belong into inode.c but actually reside in readwrite.c */
 int logfs_read_inode(struct inode *inode);
-int __logfs_write_inode(struct inode *inode, long flags);
+int __logfs_write_inode(struct inode *inode, struct page *, long flags);
 void logfs_evict_inode(struct inode *inode);
 
 /* journal.c */
@@ -577,6 +577,8 @@ void initialize_block_counters(struct page *page, struct logfs_block *block,
                 __be64 *array, int page_is_empty);
 int logfs_exist_block(struct inode *inode, u64 bix);
 int get_page_reserve(struct inode *inode, struct page *page);
+void logfs_get_wblocks(struct super_block *sb, struct page *page, int lock);
+void logfs_put_wblocks(struct super_block *sb, struct page *page, int lock);
 extern struct logfs_block_ops indirect_block_ops;
 
 /* segment.c */
@@ -594,6 +596,7 @@ int logfs_init_mapping(struct super_block *sb);
 void logfs_sync_area(struct logfs_area *area);
 void logfs_sync_segments(struct super_block *sb);
 void freeseg(struct super_block *sb, u32 segno);
+void free_areas(struct super_block *sb);
 
 /* area handling */
 int logfs_init_areas(struct super_block *sb);
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index 2ac4217b7901..4153e65b0148 100644
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -244,8 +244,7 @@ static void preunlock_page(struct super_block *sb, struct page *page, int lock)
  * is waiting for s_write_mutex.  We annotate this fact by setting PG_pre_locked
  * in addition to PG_locked.
  */
-static void logfs_get_wblocks(struct super_block *sb, struct page *page,
-                int lock)
+void logfs_get_wblocks(struct super_block *sb, struct page *page, int lock)
 {
         struct logfs_super *super = logfs_super(sb);
 
@@ -260,8 +259,7 @@ static void logfs_get_wblocks(struct super_block *sb, struct page *page,
         }
 }
 
-static void logfs_put_wblocks(struct super_block *sb, struct page *page,
-                int lock)
+void logfs_put_wblocks(struct super_block *sb, struct page *page, int lock)
 {
         struct logfs_super *super = logfs_super(sb);
 
@@ -424,7 +422,7 @@ static void inode_write_block(struct logfs_block *block)
         if (inode->i_ino == LOGFS_INO_MASTER)
                 logfs_write_anchor(inode->i_sb);
         else {
-                ret = __logfs_write_inode(inode, 0);
+                ret = __logfs_write_inode(inode, NULL, 0);
                 /* see indirect_write_block comment */
                 BUG_ON(ret);
         }
@@ -560,8 +558,13 @@ static void inode_free_block(struct super_block *sb, struct logfs_block *block)
 static void indirect_free_block(struct super_block *sb,
                 struct logfs_block *block)
 {
-        ClearPagePrivate(block->page);
-        block->page->private = 0;
+        struct page *page = block->page;
+
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
         __free_block(sb, block);
 }
 
@@ -650,8 +653,11 @@ static void alloc_data_block(struct inode *inode, struct page *page)
         logfs_unpack_index(page->index, &bix, &level);
         block = __alloc_block(inode->i_sb, inode->i_ino, bix, level);
         block->page = page;
+
         SetPagePrivate(page);
-        page->private = (unsigned long)block;
+        page_cache_get(page);
+        set_page_private(page, (unsigned long) block);
+
         block->ops = &indirect_block_ops;
 }
 
@@ -1570,11 +1576,15 @@ int logfs_write_buf(struct inode *inode, struct page *page, long flags)
 static int __logfs_delete(struct inode *inode, struct page *page)
 {
         long flags = WF_DELETE;
+        int err;
 
         inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 
         if (page->index < I0_BLOCKS)
                 return logfs_write_direct(inode, page, flags);
+        err = grow_inode(inode, page->index, 0);
+        if (err)
+                return err;
         return logfs_write_rec(inode, page, page->index, 0, flags);
 }
 
@@ -1623,7 +1633,7 @@ int logfs_rewrite_block(struct inode *inode, u64 bix, u64 ofs,
                         if (inode->i_ino == LOGFS_INO_MASTER)
                                 logfs_write_anchor(inode->i_sb);
                         else {
-                                err = __logfs_write_inode(inode, flags);
+                                err = __logfs_write_inode(inode, page, flags);
                         }
                 }
         }
@@ -1873,7 +1883,7 @@ int logfs_truncate(struct inode *inode, u64 target)
                 logfs_get_wblocks(sb, NULL, 1);
                 err = __logfs_truncate(inode, size);
                 if (!err)
-                        err = __logfs_write_inode(inode, 0);
+                        err = __logfs_write_inode(inode, NULL, 0);
                 logfs_put_wblocks(sb, NULL, 1);
         }
 
@@ -1901,8 +1911,11 @@ static void move_page_to_inode(struct inode *inode, struct page *page)
         li->li_block = block;
 
         block->page = NULL;
-        page->private = 0;
-        ClearPagePrivate(page);
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
 }
 
 static void move_inode_to_page(struct page *page, struct inode *inode)
@@ -1918,8 +1931,12 @@ static void move_inode_to_page(struct page *page, struct inode *inode)
         BUG_ON(PagePrivate(page));
         block->ops = &indirect_block_ops;
         block->page = page;
-        page->private = (unsigned long)block;
-        SetPagePrivate(page);
+
+        if (!PagePrivate(page)) {
+                SetPagePrivate(page);
+                page_cache_get(page);
+                set_page_private(page, (unsigned long) block);
+        }
 
         block->inode = NULL;
         li->li_block = NULL;
@@ -2106,14 +2123,14 @@ void logfs_set_segment_unreserved(struct super_block *sb, u32 segno, u32 ec)
                         ec_level);
 }
 
-int __logfs_write_inode(struct inode *inode, long flags)
+int __logfs_write_inode(struct inode *inode, struct page *page, long flags)
 {
         struct super_block *sb = inode->i_sb;
         int ret;
 
-        logfs_get_wblocks(sb, NULL, flags & WF_LOCK);
+        logfs_get_wblocks(sb, page, flags & WF_LOCK);
         ret = do_write_inode(inode);
-        logfs_put_wblocks(sb, NULL, flags & WF_LOCK);
+        logfs_put_wblocks(sb, page, flags & WF_LOCK);
         return ret;
 }
 
diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c
index 9d5187353255..ab798ed1cc88 100644
--- a/fs/logfs/segment.c
+++ b/fs/logfs/segment.c
@@ -86,7 +86,11 @@ int __logfs_buf_write(struct logfs_area *area, u64 ofs, void *buf, size_t len,
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 SetPageUptodate(page);
                 memcpy(page_address(page) + offset, buf, copylen);
-                SetPagePrivate(page);
+
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
 
                 buf += copylen;
@@ -110,7 +114,10 @@ static void pad_partial_page(struct logfs_area *area)
                 page = get_mapping_page(sb, index, 0);
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 memset(page_address(page) + offset, 0xff, len);
-                SetPagePrivate(page);
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
         }
 }
@@ -130,7 +137,10 @@ static void pad_full_pages(struct logfs_area *area)
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 SetPageUptodate(page);
                 memset(page_address(page), 0xff, PAGE_CACHE_SIZE);
-                SetPagePrivate(page);
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
                 index++;
                 no_indizes--;
@@ -485,8 +495,12 @@ static void move_btree_to_page(struct inode *inode, struct page *page,
                 mempool_free(item, super->s_alias_pool);
         }
         block->page = page;
-        SetPagePrivate(page);
-        page->private = (unsigned long)block;
+
+        if (!PagePrivate(page)) {
+                SetPagePrivate(page);
+                page_cache_get(page);
+                set_page_private(page, (unsigned long) block);
+        }
         block->ops = &indirect_block_ops;
         initialize_block_counters(page, block, data, 0);
 }
@@ -536,8 +550,12 @@ void move_page_to_btree(struct page *page)
                 list_add(&item->list, &block->item_list);
         }
         block->page = NULL;
-        ClearPagePrivate(page);
-        page->private = 0;
+
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
         block->ops = &btree_block_ops;
         err = alias_tree_insert(block->sb, block->ino, block->bix, block->level,
                         block);
@@ -702,7 +720,10 @@ void freeseg(struct super_block *sb, u32 segno)
                 page = find_get_page(mapping, ofs >> PAGE_SHIFT);
                 if (!page)
                         continue;
-                ClearPagePrivate(page);
+                if (PagePrivate(page)) {
+                        ClearPagePrivate(page);
+                        page_cache_release(page);
+                }
                 page_cache_release(page);
         }
 }
@@ -841,6 +862,16 @@ static void free_area(struct logfs_area *area)
         kfree(area);
 }
 
+void free_areas(struct super_block *sb)
+{
+        struct logfs_super *super = logfs_super(sb);
+        int i;
+
+        for_each_area(i)
+                free_area(super->s_area[i]);
+        free_area(super->s_journal_area);
+}
+
 static struct logfs_area *alloc_area(struct super_block *sb)
 {
         struct logfs_area *area;
@@ -923,10 +954,6 @@ err:
 void logfs_cleanup_areas(struct super_block *sb)
 {
         struct logfs_super *super = logfs_super(sb);
-        int i;
 
         btree_grim_visitor128(&super->s_object_alias_tree, 0, kill_alias);
-        for_each_area(i)
-                free_area(super->s_area[i]);
-        free_area(super->s_journal_area);
 }
diff --git a/fs/logfs/super.c b/fs/logfs/super.c
index e795c234ea33..c9ee7f5d1caf 100644
--- a/fs/logfs/super.c
+++ b/fs/logfs/super.c
@@ -486,14 +486,15 @@ static void logfs_kill_sb(struct super_block *sb)
         /* Alias entries slow down mount, so evict as many as possible */
         sync_filesystem(sb);
         logfs_write_anchor(sb);
+        free_areas(sb);
 
         /*
          * From this point on alias entries are simply dropped - and any
          * writes to the object store are considered bugs.
          */
-        super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN;
         log_super("LogFS: Now in shutdown\n");
         generic_shutdown_super(sb);
+        super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN;
 
         BUG_ON(super->s_dirty_used_bytes || super->s_dirty_free_bytes);
 
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 886649627c3d..2a70fce70c65 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -603,6 +603,8 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
         nsegs = argv[4].v_nmembs;
         if (argv[4].v_size != argsz[4])
                 goto out;
+        if (nsegs > UINT_MAX / sizeof(__u64))
+                goto out;
 
         /*
          * argv[4] points to segment numbers this ioctl cleans.  We
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 9cde9edf9c4d..d4548dd49b02 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -198,26 +198,6 @@ static int proc_root_link(struct dentry *dentry, struct path *path)
         return result;
 }
 
-static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
-{
-        struct mm_struct *mm;
-        int err;
-
-        err =  mutex_lock_killable(&task->signal->cred_guard_mutex);
-        if (err)
-                return ERR_PTR(err);
-
-        mm = get_task_mm(task);
-        if (mm && mm != current->mm &&
-                        !ptrace_may_access(task, mode)) {
-                mmput(mm);
-                mm = ERR_PTR(-EACCES);
-        }
-        mutex_unlock(&task->signal->cred_guard_mutex);
-
-        return mm;
-}
-
 struct mm_struct *mm_for_maps(struct task_struct *task)
 {
         return mm_access(task, PTRACE_MODE_READ);
@@ -711,6 +691,13 @@ static int mem_open(struct inode* inode, struct file* file)
         if (IS_ERR(mm))
                 return PTR_ERR(mm);
 
+        if (mm) {
+                /* ensure this mm_struct can't be freed */
+                atomic_inc(&mm->mm_count);
+                /* but do not pin its memory */
+                mmput(mm);
+        }
+
         /* OK to pass negative loff_t, we can catch out-of-range */
         file->f_mode |= FMODE_UNSIGNED_OFFSET;
         file->private_data = mm;
@@ -718,57 +705,13 @@ static int mem_open(struct inode* inode, struct file* file)
         return 0;
 }
 
-static ssize_t mem_read(struct file * file, char __user * buf,
-                        size_t count, loff_t *ppos)
+static ssize_t mem_rw(struct file *file, char __user *buf,
+                        size_t count, loff_t *ppos, int write)
 {
-        int ret;
-        char *page;
-        unsigned long src = *ppos;
         struct mm_struct *mm = file->private_data;
-
-        if (!mm)
-                return 0;
-
-        page = (char *)__get_free_page(GFP_TEMPORARY);
-        if (!page)
-                return -ENOMEM;
-
-        ret = 0;
- 
-        while (count > 0) {
-                int this_len, retval;
-
-                this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
-                retval = access_remote_vm(mm, src, page, this_len, 0);
-                if (!retval) {
-                        if (!ret)
-                                ret = -EIO;
-                        break;
-                }
-
-                if (copy_to_user(buf, page, retval)) {
-                        ret = -EFAULT;
-                        break;
-                }
- 
-                ret += retval;
-                src += retval;
-                buf += retval;
-                count -= retval;
-        }
-        *ppos = src;
-
-        free_page((unsigned long) page);
-        return ret;
-}
-
-static ssize_t mem_write(struct file * file, const char __user *buf,
-                         size_t count, loff_t *ppos)
-{
-        int copied;
+        unsigned long addr = *ppos;
+        ssize_t copied;
         char *page;
-        unsigned long dst = *ppos;
-        struct mm_struct *mm = file->private_data;
 
         if (!mm)
                 return 0;
@@ -778,31 +721,54 @@ static ssize_t mem_write(struct file * file, const char __user *buf,
                 return -ENOMEM;
 
         copied = 0;
+        if (!atomic_inc_not_zero(&mm->mm_users))
+                goto free;
+
         while (count > 0) {
-                int this_len, retval;
+                int this_len = min_t(int, count, PAGE_SIZE);
 
-                this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
-                if (copy_from_user(page, buf, this_len)) {
+                if (write && copy_from_user(page, buf, this_len)) {
                         copied = -EFAULT;
                         break;
                 }
-                retval = access_remote_vm(mm, dst, page, this_len, 1);
-                if (!retval) {
+
+                this_len = access_remote_vm(mm, addr, page, this_len, write);
+                if (!this_len) {
                         if (!copied)
                                 copied = -EIO;
                         break;
                 }
-                copied += retval;
-                buf += retval;
-                dst += retval;
-                count -= retval;                        
+
+                if (!write && copy_to_user(buf, page, this_len)) {
+                        copied = -EFAULT;
+                        break;
+                }
+
+                buf += this_len;
+                addr += this_len;
+                copied += this_len;
+                count -= this_len;
         }
-        *ppos = dst;
+        *ppos = addr;
 
+        mmput(mm);
+free:
         free_page((unsigned long) page);
         return copied;
 }
 
+static ssize_t mem_read(struct file *file, char __user *buf,
+                        size_t count, loff_t *ppos)
+{
+        return mem_rw(file, buf, count, ppos, 0);
+}
+
+static ssize_t mem_write(struct file *file, const char __user *buf,
+                         size_t count, loff_t *ppos)
+{
+        return mem_rw(file, (char __user*)buf, count, ppos, 1);
+}
+
 loff_t mem_lseek(struct file *file, loff_t offset, int orig)
 {
         switch (orig) {
@@ -822,8 +788,8 @@ loff_t mem_lseek(struct file *file, loff_t offset, int orig)
 static int mem_release(struct inode *inode, struct file *file)
 {
         struct mm_struct *mm = file->private_data;
-
-        mmput(mm);
+        if (mm)
+                mmdrop(mm);
         return 0;
 }
 
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 62f4fb37789e..00012e31829d 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -493,6 +493,12 @@ int sysfs_attr_ns(struct kobject *kobj, const struct attribute *attr,
         const void *ns = NULL;
         int err;
 
+        if (!dir_sd) {
+                WARN(1, KERN_ERR "sysfs: kobject %s without dirent\n",
+                        kobject_name(kobj));
+                return -ENOENT;
+        }
+
         err = 0;
         if (!sysfs_ns_type(dir_sd))
                 goto out;
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 4a802b4a9056..85eb81683a29 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -318,8 +318,11 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const void *ns, const cha
         struct sysfs_addrm_cxt acxt;
         struct sysfs_dirent *sd;
 
-        if (!dir_sd)
+        if (!dir_sd) {
+                WARN(1, KERN_WARNING "sysfs: can not remove '%s', no directory\n",
+                        name);
                 return -ENOENT;
+        }
 
         sysfs_addrm_start(&acxt, dir_sd);
 
diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
index 8de4b73e19e2..e58fcf891370 100644
--- a/include/asm-generic/pci_iomap.h
+++ b/include/asm-generic/pci_iomap.h
@@ -15,6 +15,16 @@ struct pci_dev;
 #ifdef CONFIG_PCI
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
+/* Create a virtual mapping cookie for a port on a given PCI device.
+ * Do not call this directly, it exists to make it easier for architectures
+ * to override */
+#ifdef CONFIG_NO_GENERIC_PCI_IOPORT_MAP
+extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port,
+                                      unsigned int nr);
+#else
+#define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))
+#endif
+
 #else
 static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
 {
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index fd88a3945aa1..0092102db2de 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -18,7 +18,7 @@ struct pt_regs;
 #define BINPRM_BUF_SIZE 128
 
 #ifdef __KERNEL__
-#include <linux/list.h>
+#include <linux/sched.h>
 
 #define CORENAME_MAX_SIZE 128
 
@@ -58,6 +58,7 @@ struct linux_binprm {
         unsigned interp_flags;
         unsigned interp_data;
         unsigned long loader, exec;
+        char tcomm[TASK_COMM_LEN];
 };
 
 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index 0ab54e16a91f..d09af4b67cf1 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -39,6 +39,7 @@ extern bool __refrigerator(bool check_kthr_stop);
 extern int freeze_processes(void);
 extern int freeze_kernel_threads(void);
 extern void thaw_processes(void);
+extern void thaw_kernel_threads(void);
 
 static inline bool try_to_freeze(void)
 {
@@ -174,6 +175,7 @@ static inline bool __refrigerator(bool check_kthr_stop) { return false; }
 static inline int freeze_processes(void) { return -ENOSYS; }
 static inline int freeze_kernel_threads(void) { return -ENOSYS; }
 static inline void thaw_processes(void) {}
+static inline void thaw_kernel_threads(void) {}
 
 static inline bool try_to_freeze(void) { return false; }
 
diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
index b5ca4b2c08ec..004ff33ab38e 100644
--- a/include/linux/gpio_keys.h
+++ b/include/linux/gpio_keys.h
@@ -1,6 +1,8 @@
 #ifndef _GPIO_KEYS_H
 #define _GPIO_KEYS_H
 
+struct device;
+
 struct gpio_keys_button {
         /* Configuration parameters */
         unsigned int code;      /* input event code (KEY_*, SW_*) */
diff --git a/include/linux/lp8727.h b/include/linux/lp8727.h
index d21fa2865bf4..d21fa2865bf4 100755..100644
--- a/include/linux/lp8727.h
+++ b/include/linux/lp8727.h
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 2463c2619596..9bc9ac651dad 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -187,8 +187,10 @@ struct twl6040 {
         int rev;
         u8 vibra_ctrl_cache[2];
 
+        /* PLL configuration */
         int pll;
         unsigned int sysclk;
+        unsigned int mclk;
 
         unsigned int irq;
         unsigned int irq_base;
diff --git a/include/linux/mpi.h b/include/linux/mpi.h
index 06f88994ccaa..d02cca6cc8ce 100644
--- a/include/linux/mpi.h
+++ b/include/linux/mpi.h
@@ -57,8 +57,6 @@ struct gcry_mpi {
 
 typedef struct gcry_mpi *MPI;
 
-#define MPI_NULL NULL
-
 #define mpi_get_nlimbs(a)     ((a)->nlimbs)
 #define mpi_is_neg(a)         ((a)->sign)
 
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 1a81fde8f333..d43dc25af82e 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -427,9 +427,7 @@ static inline int mtd_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 
 static inline int mtd_suspend(struct mtd_info *mtd)
 {
-        if (!mtd->suspend)
-                return -EOPNOTSUPP;
-        return mtd->suspend(mtd);
+        return mtd->suspend ? mtd->suspend(mtd) : 0;
 }
 
 static inline void mtd_resume(struct mtd_info *mtd)
@@ -441,7 +439,7 @@ static inline void mtd_resume(struct mtd_info *mtd)
 static inline int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs)
 {
         if (!mtd->block_isbad)
-                return -EOPNOTSUPP;
+                return 0;
         return mtd->block_isbad(mtd, ofs);
 }
 
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 08855613ceb3..abb2776be1ba 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -587,6 +587,7 @@ struct hw_perf_event {
         u64                             sample_period;
         u64                             last_period;
         local64_t                       period_left;
+        u64                             interrupts_seq;
         u64                             interrupts;
 
         u64                             freq_time_stamp;
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index e5bbcbaa6f57..4d99e4e6ef83 100644
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -110,7 +110,19 @@ static inline void pm_qos_remove_request(struct pm_qos_request *req)
                         { return; }
 
 static inline int pm_qos_request(int pm_qos_class)
-                        { return 0; }
+{
+        switch (pm_qos_class) {
+        case PM_QOS_CPU_DMA_LATENCY:
+                return PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
+        case PM_QOS_NETWORK_LATENCY:
+                return PM_QOS_NETWORK_LAT_DEFAULT_VALUE;
+        case PM_QOS_NETWORK_THROUGHPUT:
+                return PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE;
+        default:
+                return PM_QOS_DEFAULT_VALUE;
+        }
+}
+
 static inline int pm_qos_add_notifier(int pm_qos_class,
                                       struct notifier_block *notifier)
                         { return 0; }
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2234985a5e65..7d379a6bfd88 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2259,6 +2259,12 @@ static inline void mmdrop(struct mm_struct * mm)
 extern void mmput(struct mm_struct *);
 /* Grab a reference to a task's mm, if it is not already going away */
 extern struct mm_struct *get_task_mm(struct task_struct *task);
+/*
+ * Grab a reference to a task's mm, if it is not already going away
+ * and ptrace_may_access with the mode parameter passed to it
+ * succeeds.
+ */
+extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);
 /* Remove the current tasks stale references to the old mm_struct */
 extern void mm_release(struct task_struct *, struct mm_struct *);
 /* Allocate a new mm structure and copy contents from tsk->mm */
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index 8cd7fe59cf1a..425450b980b8 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -70,6 +70,7 @@ struct sh_dmae_pdata {
         unsigned int needs_tend_set:1;
         unsigned int no_dmars:1;
         unsigned int chclr_present:1;
+        unsigned int slave_only:1;
 };
 
 /* DMA register */
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
deleted file mode 100644
index 20f63d3e6144..000000000000
--- a/include/linux/sysdev.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * System devices follow a slightly different driver model. 
- * They don't need to do dynammic driver binding, can't be probed, 
- * and don't reside on any type of peripheral bus. 
- * So, we represent and treat them a little differently.
- * 
- * We still have a notion of a driver for a system device, because we still
- * want to perform basic operations on these devices. 
- *
- * We also support auxiliary drivers binding to devices of a certain class.
- * 
- * This allows configurable drivers to register themselves for devices of
- * a certain type. And, it allows class definitions to reside in generic
- * code while arch-specific code can register specific drivers.
- *
- * Auxiliary drivers registered with a NULL cls are registered as drivers
- * for all system devices, and get notification calls for each device. 
- */
-
-
-#ifndef _SYSDEV_H_
-#define _SYSDEV_H_
-
-#include <linux/kobject.h>
-#include <linux/pm.h>
-
-
-struct sys_device;
-struct sysdev_class_attribute;
-
-struct sysdev_class {
-        const char *name;
-        struct list_head        drivers;
-        struct sysdev_class_attribute **attrs;
-        struct kset             kset;
-};
-
-struct sysdev_class_attribute {
-        struct attribute attr;
-        ssize_t (*show)(struct sysdev_class *, struct sysdev_class_attribute *,
-                        char *);
-        ssize_t (*store)(struct sysdev_class *, struct sysdev_class_attribute *,
-                         const char *, size_t);
-};
-
-#define _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)            \
-{                                                               \
-        .attr = {.name = __stringify(_name), .mode = _mode },   \
-        .show   = _show,                                        \
-        .store  = _store,                                       \
-}
-
-#define SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)             \
-        struct sysdev_class_attribute attr_##_name =            \
-                _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)
-
-
-extern int sysdev_class_register(struct sysdev_class *);
-extern void sysdev_class_unregister(struct sysdev_class *);
-
-extern int sysdev_class_create_file(struct sysdev_class *,
-        struct sysdev_class_attribute *);
-extern void sysdev_class_remove_file(struct sysdev_class *,
-        struct sysdev_class_attribute *);
-/**
- * Auxiliary system device drivers.
- */
-
-struct sysdev_driver {
-        struct list_head        entry;
-        int     (*add)(struct sys_device *);
-        int     (*remove)(struct sys_device *);
-};
-
-
-extern int sysdev_driver_register(struct sysdev_class *, struct sysdev_driver *);
-extern void sysdev_driver_unregister(struct sysdev_class *, struct sysdev_driver *);
-
-
-/**
- * sys_devices can be simplified a lot from regular devices, because they're
- * simply not as versatile. 
- */
-
-struct sys_device {
-        u32             id;
-        struct sysdev_class     * cls;
-        struct kobject          kobj;
-};
-
-extern int sysdev_register(struct sys_device *);
-extern void sysdev_unregister(struct sys_device *);
-
-
-struct sysdev_attribute { 
-        struct attribute        attr;
-        ssize_t (*show)(struct sys_device *, struct sysdev_attribute *, char *);
-        ssize_t (*store)(struct sys_device *, struct sysdev_attribute *,
-                         const char *, size_t);
-};
-
-
-#define _SYSDEV_ATTR(_name, _mode, _show, _store)               \
-{                                                               \
-        .attr = { .name = __stringify(_name), .mode = _mode },  \
-        .show   = _show,                                        \
-        .store  = _store,                                       \
-}
-
-#define SYSDEV_ATTR(_name, _mode, _show, _store)                \
-        struct sysdev_attribute attr_##_name =                  \
-                _SYSDEV_ATTR(_name, _mode, _show, _store);
-
-extern int sysdev_create_file(struct sys_device *, struct sysdev_attribute *);
-extern void sysdev_remove_file(struct sys_device *, struct sysdev_attribute *);
-
-/* Create/remove NULL terminated attribute list */
-static inline int
-sysdev_create_files(struct sys_device *d, struct sysdev_attribute **a)
-{
-        return sysfs_create_files(&d->kobj, (const struct attribute **)a);
-}
-
-static inline void
-sysdev_remove_files(struct sys_device *d, struct sysdev_attribute **a)
-{
-        return sysfs_remove_files(&d->kobj, (const struct attribute **)a);
-}
-
-struct sysdev_ext_attribute {
-        struct sysdev_attribute attr;
-        void *var;
-};
-
-/*
- * Support for simple variable sysdev attributes.
- * The pointer to the variable is stored in a sysdev_ext_attribute
- */
-
-/* Add more types as needed */
-
-extern ssize_t sysdev_show_ulong(struct sys_device *, struct sysdev_attribute *,
-                                char *);
-extern ssize_t sysdev_store_ulong(struct sys_device *,
-                        struct sysdev_attribute *, const char *, size_t);
-extern ssize_t sysdev_show_int(struct sys_device *, struct sysdev_attribute *,
-                                char *);
-extern ssize_t sysdev_store_int(struct sys_device *,
-                        struct sysdev_attribute *, const char *, size_t);
-
-#define _SYSDEV_ULONG_ATTR(_name, _mode, _var)                          \
-        { _SYSDEV_ATTR(_name, _mode, sysdev_show_ulong, sysdev_store_ulong), \
-          &(_var) }
-#define SYSDEV_ULONG_ATTR(_name, _mode, _var)                   \
-        struct sysdev_ext_attribute attr_##_name =              \
-                _SYSDEV_ULONG_ATTR(_name, _mode, _var);
-#define _SYSDEV_INT_ATTR(_name, _mode, _var)                            \
-        { _SYSDEV_ATTR(_name, _mode, sysdev_show_int, sysdev_store_int), \
-          &(_var) }
-#define SYSDEV_INT_ATTR(_name, _mode, _var)                     \
-        struct sysdev_ext_attribute attr_##_name =              \
-                _SYSDEV_INT_ATTR(_name, _mode, _var);
-
-#endif /* _SYSDEV_H_ */
diff --git a/include/linux/usb/langwell_otg.h b/include/linux/usb/langwell_otg.h
deleted file mode 100644
index 51f17b16d312..000000000000
--- a/include/linux/usb/langwell_otg.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Intel Langwell USB OTG transceiver driver
- * Copyright (C) 2008 - 2010, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef __LANGWELL_OTG_H
-#define __LANGWELL_OTG_H
-
-#include <linux/usb/intel_mid_otg.h>
-
-#define CI_USBCMD               0x30
-#       define USBCMD_RST               BIT(1)
-#       define USBCMD_RS                BIT(0)
-#define CI_USBSTS               0x34
-#       define USBSTS_SLI               BIT(8)
-#       define USBSTS_URI               BIT(6)
-#       define USBSTS_PCI               BIT(2)
-#define CI_PORTSC1              0x74
-#       define PORTSC_PP                BIT(12)
-#       define PORTSC_LS                (BIT(11) | BIT(10))
-#       define PORTSC_SUSP              BIT(7)
-#       define PORTSC_CCS               BIT(0)
-#define CI_HOSTPC1              0xb4
-#       define HOSTPC1_PHCD             BIT(22)
-#define CI_OTGSC                0xf4
-#       define OTGSC_DPIE               BIT(30)
-#       define OTGSC_1MSE               BIT(29)
-#       define OTGSC_BSEIE              BIT(28)
-#       define OTGSC_BSVIE              BIT(27)
-#       define OTGSC_ASVIE              BIT(26)
-#       define OTGSC_AVVIE              BIT(25)
-#       define OTGSC_IDIE               BIT(24)
-#       define OTGSC_DPIS               BIT(22)
-#       define OTGSC_1MSS               BIT(21)
-#       define OTGSC_BSEIS              BIT(20)
-#       define OTGSC_BSVIS              BIT(19)
-#       define OTGSC_ASVIS              BIT(18)
-#       define OTGSC_AVVIS              BIT(17)
-#       define OTGSC_IDIS               BIT(16)
-#       define OTGSC_DPS                BIT(14)
-#       define OTGSC_1MST               BIT(13)
-#       define OTGSC_BSE                BIT(12)
-#       define OTGSC_BSV                BIT(11)
-#       define OTGSC_ASV                BIT(10)
-#       define OTGSC_AVV                BIT(9)
-#       define OTGSC_ID                 BIT(8)
-#       define OTGSC_HABA               BIT(7)
-#       define OTGSC_HADP               BIT(6)
-#       define OTGSC_IDPU               BIT(5)
-#       define OTGSC_DP                 BIT(4)
-#       define OTGSC_OT                 BIT(3)
-#       define OTGSC_HAAR               BIT(2)
-#       define OTGSC_VC                 BIT(1)
-#       define OTGSC_VD                 BIT(0)
-#       define OTGSC_INTEN_MASK         (0x7f << 24)
-#       define OTGSC_INT_MASK           (0x5f << 24)
-#       define OTGSC_INTSTS_MASK        (0x7f << 16)
-#define CI_USBMODE              0xf8
-#       define USBMODE_CM               (BIT(1) | BIT(0))
-#       define USBMODE_IDLE             0
-#       define USBMODE_DEVICE           0x2
-#       define USBMODE_HOST             0x3
-#define USBCFG_ADDR                     0xff10801c
-#define USBCFG_LEN                      4
-#       define USBCFG_VBUSVAL           BIT(14)
-#       define USBCFG_AVALID            BIT(13)
-#       define USBCFG_BVALID            BIT(12)
-#       define USBCFG_SESEND            BIT(11)
-
-#define INTR_DUMMY_MASK (USBSTS_SLI | USBSTS_URI | USBSTS_PCI)
-
-enum langwell_otg_timer_type {
-        TA_WAIT_VRISE_TMR,
-        TA_WAIT_BCON_TMR,
-        TA_AIDL_BDIS_TMR,
-        TB_ASE0_BRST_TMR,
-        TB_SE0_SRP_TMR,
-        TB_SRP_INIT_TMR,
-        TB_SRP_FAIL_TMR,
-        TB_BUS_SUSPEND_TMR
-};
-
-#define TA_WAIT_VRISE   100
-#define TA_WAIT_BCON    30000
-#define TA_AIDL_BDIS    15000
-#define TB_ASE0_BRST    5000
-#define TB_SE0_SRP      2
-#define TB_SRP_INIT     100
-#define TB_SRP_FAIL     5500
-#define TB_BUS_SUSPEND  500
-
-struct langwell_otg_timer {
-        unsigned long expires;  /* Number of count increase to timeout */
-        unsigned long count;    /* Tick counter */
-        void (*function)(unsigned long);        /* Timeout function */
-        unsigned long data;     /* Data passed to function */
-        struct list_head list;
-};
-
-struct langwell_otg {
-        struct intel_mid_otg_xceiv      iotg;
-        struct device                   *dev;
-
-        void __iomem                    *usbcfg;        /* SCCBUSB config Reg */
-
-        unsigned                        region;
-        unsigned                        cfg_region;
-
-        struct work_struct              work;
-        struct workqueue_struct         *qwork;
-        struct timer_list               hsm_timer;
-
-        spinlock_t                      lock;
-        spinlock_t                      wq_lock;
-
-        struct notifier_block           iotg_notifier;
-};
-
-static inline
-struct langwell_otg *mid_xceiv_to_lnw(struct intel_mid_otg_xceiv *iotg)
-{
-        return container_of(iotg, struct langwell_otg, iotg);
-}
-
-#endif /* __LANGWELL_OTG_H__ */
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 3419bf5cd154..d55f43443335 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -41,6 +41,7 @@ static inline void *net_generic(const struct net *net, int id)
         ptr = ng->ptr[id - 1];
         rcu_read_unlock();
 
+        BUG_ON(!ptr);
         return ptr;
 }
 #endif
diff --git a/include/net/sock.h b/include/net/sock.h
index 4c69ac165e6b..91c1c8baf020 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -55,6 +55,7 @@
 #include <linux/uaccess.h>
 #include <linux/memcontrol.h>
 #include <linux/res_counter.h>
+#include <linux/jump_label.h>
 
 #include <linux/filter.h>
 #include <linux/rculist_nulls.h>
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 0118ea999f67..d49db0113a06 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -311,6 +311,8 @@ extern struct proto tcp_prot;
 #define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)
 #define TCP_ADD_STATS(net, field, val)  SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val)
 
+extern void tcp_init_mem(struct net *net);
+
 extern void tcp_v4_err(struct sk_buff *skb, u32);
 
 extern void tcp_shutdown (struct sock *sk, int how);
diff --git a/include/sound/core.h b/include/sound/core.h
index 5ab255f196cc..cea1b5426dfa 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -417,6 +417,7 @@ static inline int __snd_bug_on(int cond)
 #define gameport_get_port_data(gp) (gp)->port_data
 #endif
 
+#ifdef CONFIG_PCI
 /* PCI quirk list helper */
 struct snd_pci_quirk {
         unsigned short subvendor;       /* PCI subvendor ID */
@@ -456,5 +457,6 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list);
 const struct snd_pci_quirk *
 snd_pci_quirk_lookup_id(u16 vendor, u16 device,
                         const struct snd_pci_quirk *list);
+#endif
 
 #endif /* __SOUND_CORE_H */
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 4866499bdeeb..e5e6ff98f0fa 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -59,7 +59,7 @@ int	transport_set_vpd_ident_type(struct t10_vpd *, unsigned char *);
 int     transport_set_vpd_ident(struct t10_vpd *, unsigned char *);
 
 /* core helpers also used by command snooping in pscsi */
-void    *transport_kmap_first_data_page(struct se_cmd *);
-void    transport_kunmap_first_data_page(struct se_cmd *);
+void    *transport_kmap_data_sg(struct se_cmd *);
+void    transport_kunmap_data_sg(struct se_cmd *);
 
 #endif /* TARGET_CORE_BACKEND_H */
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index daf532bc721a..dc4e345a0163 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -582,6 +582,7 @@ struct se_cmd {
 
         struct scatterlist      *t_data_sg;
         unsigned int            t_data_nents;
+        void                    *t_data_vmap;
         struct scatterlist      *t_bidi_data_sg;
         unsigned int            t_bidi_data_nents;
 
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 523e8bc104d4..d36fad317e78 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -114,7 +114,7 @@ void	transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *,
                 struct se_session *, u32, int, int, unsigned char *);
 int     transport_lookup_cmd_lun(struct se_cmd *, u32);
 int     transport_generic_allocate_tasks(struct se_cmd *, unsigned char *);
-int     target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
+void    target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
                 unsigned char *, u32, u32, int, int, int);
 int     transport_handle_cdb_direct(struct se_cmd *);
 int     transport_generic_handle_cdb_map(struct se_cmd *);
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 062b3b24ff10..483f67caa7ad 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -590,6 +590,11 @@ struct omap_dss_device {
         int (*get_backlight)(struct omap_dss_device *dssdev);
 };
 
+struct omap_dss_hdmi_data
+{
+        int hpd_gpio;
+};
+
 struct omap_dss_driver {
         struct device_driver driver;
 
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 32b48c889711..ba36013cfb21 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2300,6 +2300,9 @@ do {					\
         return div64_u64(dividend, divisor);
 }
 
+static DEFINE_PER_CPU(int, perf_throttled_count);
+static DEFINE_PER_CPU(u64, perf_throttled_seq);
+
 static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
 {
         struct hw_perf_event *hwc = &event->hw;
@@ -2325,16 +2328,29 @@ static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
         }
 }
 
-static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
+/*
+ * combine freq adjustment with unthrottling to avoid two passes over the
+ * events. At the same time, make sure, having freq events does not change
+ * the rate of unthrottling as that would introduce bias.
+ */
+static void perf_adjust_freq_unthr_context(struct perf_event_context *ctx,
+                                           int needs_unthr)
 {
         struct perf_event *event;
         struct hw_perf_event *hwc;
-        u64 interrupts, now;
+        u64 now, period = TICK_NSEC;
         s64 delta;
 
-        if (!ctx->nr_freq)
+        /*
+         * only need to iterate over all events iff:
+         * - context have events in frequency mode (needs freq adjust)
+         * - there are events to unthrottle on this cpu
+         */
+        if (!(ctx->nr_freq || needs_unthr))
                 return;
 
+        raw_spin_lock(&ctx->lock);
+
         list_for_each_entry_rcu(event, &ctx->event_list, event_entry) {
                 if (event->state != PERF_EVENT_STATE_ACTIVE)
                         continue;
@@ -2344,13 +2360,8 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
 
                 hwc = &event->hw;
 
-                interrupts = hwc->interrupts;
-                hwc->interrupts = 0;
-
-                /*
-                 * unthrottle events on the tick
-                 */
-                if (interrupts == MAX_INTERRUPTS) {
+                if (needs_unthr && hwc->interrupts == MAX_INTERRUPTS) {
+                        hwc->interrupts = 0;
                         perf_log_throttle(event, 1);
                         event->pmu->start(event, 0);
                 }
@@ -2358,14 +2369,26 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
                 if (!event->attr.freq || !event->attr.sample_freq)
                         continue;
 
-                event->pmu->read(event);
+                /*
+                 * stop the event and update event->count
+                 */
+                event->pmu->stop(event, PERF_EF_UPDATE);
+
                 now = local64_read(&event->count);
                 delta = now - hwc->freq_count_stamp;
                 hwc->freq_count_stamp = now;
 
+                /*
+                 * restart the event
+                 * reload only if value has changed
+                 */
                 if (delta > 0)
                         perf_adjust_period(event, period, delta);
+
+                event->pmu->start(event, delta > 0 ? PERF_EF_RELOAD : 0);
         }
+
+        raw_spin_unlock(&ctx->lock);
 }
 
 /*
@@ -2388,16 +2411,13 @@ static void rotate_ctx(struct perf_event_context *ctx)
  */
 static void perf_rotate_context(struct perf_cpu_context *cpuctx)
 {
-        u64 interval = (u64)cpuctx->jiffies_interval * TICK_NSEC;
         struct perf_event_context *ctx = NULL;
-        int rotate = 0, remove = 1, freq = 0;
+        int rotate = 0, remove = 1;
 
         if (cpuctx->ctx.nr_events) {
                 remove = 0;
                 if (cpuctx->ctx.nr_events != cpuctx->ctx.nr_active)
                         rotate = 1;
-                if (cpuctx->ctx.nr_freq)
-                        freq = 1;
         }
 
         ctx = cpuctx->task_ctx;
@@ -2405,37 +2425,26 @@ static void perf_rotate_context(struct perf_cpu_context *cpuctx)
                 remove = 0;
                 if (ctx->nr_events != ctx->nr_active)
                         rotate = 1;
-                if (ctx->nr_freq)
-                        freq = 1;
         }
 
-        if (!rotate && !freq)
+        if (!rotate)
                 goto done;
 
         perf_ctx_lock(cpuctx, cpuctx->task_ctx);
         perf_pmu_disable(cpuctx->ctx.pmu);
 
-        if (freq) {
-                perf_ctx_adjust_freq(&cpuctx->ctx, interval);
-                if (ctx)
-                        perf_ctx_adjust_freq(ctx, interval);
-        }
-
-        if (rotate) {
-                cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE);
-                if (ctx)
-                        ctx_sched_out(ctx, cpuctx, EVENT_FLEXIBLE);
+        cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE);
+        if (ctx)
+                ctx_sched_out(ctx, cpuctx, EVENT_FLEXIBLE);
 
-                rotate_ctx(&cpuctx->ctx);
-                if (ctx)
-                        rotate_ctx(ctx);
+        rotate_ctx(&cpuctx->ctx);
+        if (ctx)
+                rotate_ctx(ctx);
 
-                perf_event_sched_in(cpuctx, ctx, current);
-        }
+        perf_event_sched_in(cpuctx, ctx, current);
 
         perf_pmu_enable(cpuctx->ctx.pmu);
         perf_ctx_unlock(cpuctx, cpuctx->task_ctx);
-
 done:
         if (remove)
                 list_del_init(&cpuctx->rotation_list);
@@ -2445,10 +2454,22 @@ void perf_event_task_tick(void)
 {
         struct list_head *head = &__get_cpu_var(rotation_list);
         struct perf_cpu_context *cpuctx, *tmp;
+        struct perf_event_context *ctx;
+        int throttled;
 
         WARN_ON(!irqs_disabled());
 
+        __this_cpu_inc(perf_throttled_seq);
+        throttled = __this_cpu_xchg(perf_throttled_count, 0);
+
         list_for_each_entry_safe(cpuctx, tmp, head, rotation_list) {
+                ctx = &cpuctx->ctx;
+                perf_adjust_freq_unthr_context(ctx, throttled);
+
+                ctx = cpuctx->task_ctx;
+                if (ctx)
+                        perf_adjust_freq_unthr_context(ctx, throttled);
+
                 if (cpuctx->jiffies_interval == 1 ||
                                 !(jiffies % cpuctx->jiffies_interval))
                         perf_rotate_context(cpuctx);
@@ -4509,6 +4530,7 @@ static int __perf_event_overflow(struct perf_event *event,
 {
         int events = atomic_read(&event->event_limit);
         struct hw_perf_event *hwc = &event->hw;
+        u64 seq;
         int ret = 0;
 
         /*
@@ -4518,14 +4540,20 @@ static int __perf_event_overflow(struct perf_event *event,
         if (unlikely(!is_sampling_event(event)))
                 return 0;
 
-        if (unlikely(hwc->interrupts >= max_samples_per_tick)) {
-                if (throttle) {
+        seq = __this_cpu_read(perf_throttled_seq);
+        if (seq != hwc->interrupts_seq) {
+                hwc->interrupts_seq = seq;
+                hwc->interrupts = 1;
+        } else {
+                hwc->interrupts++;
+                if (unlikely(throttle
+                             && hwc->interrupts >= max_samples_per_tick)) {
+                        __this_cpu_inc(perf_throttled_count);
                         hwc->interrupts = MAX_INTERRUPTS;
                         perf_log_throttle(event, 0);
                         ret = 1;
                 }
-        } else
-                hwc->interrupts++;
+        }
 
         if (event->attr.freq) {
                 u64 now = perf_clock();
diff --git a/kernel/exit.c b/kernel/exit.c
index 294b1709170d..4b4042f9bc6a 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1038,6 +1038,22 @@ void do_exit(long code)
         if (tsk->nr_dirtied)
                 __this_cpu_add(dirty_throttle_leaks, tsk->nr_dirtied);
         exit_rcu();
+
+        /*
+         * The setting of TASK_RUNNING by try_to_wake_up() may be delayed
+         * when the following two conditions become true.
+         *   - There is race condition of mmap_sem (It is acquired by
+         *     exit_mm()), and
+         *   - SMI occurs before setting TASK_RUNINNG.
+         *     (or hypervisor of virtual machine switches to other guest)
+         *  As a result, we may become TASK_RUNNING after becoming TASK_DEAD
+         *
+         * To avoid it, we have to wait for releasing tsk->pi_lock which
+         * is held by try_to_wake_up()
+         */
+        smp_mb();
+        raw_spin_unlock_wait(&tsk->pi_lock);
+
         /* causes final put_task_struct in finish_task_switch(). */
         tsk->state = TASK_DEAD;
         tsk->flags |= PF_NOFREEZE;      /* tell freezer to ignore us */
diff --git a/kernel/fork.c b/kernel/fork.c
index 051f090d40c1..1b2ef3c23ae4 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -647,6 +647,26 @@ struct mm_struct *get_task_mm(struct task_struct *task)
 }
 EXPORT_SYMBOL_GPL(get_task_mm);
 
+struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
+{
+        struct mm_struct *mm;
+        int err;
+
+        err =  mutex_lock_killable(&task->signal->cred_guard_mutex);
+        if (err)
+                return ERR_PTR(err);
+
+        mm = get_task_mm(task);
+        if (mm && mm != current->mm &&
+                        !ptrace_may_access(task, mode)) {
+                mmput(mm);
+                mm = ERR_PTR(-EACCES);
+        }
+        mutex_unlock(&task->signal->cred_guard_mutex);
+
+        return mm;
+}
+
 /* Please note the differences between mmput and mm_release.
  * mmput is called whenever we stop holding onto a mm_struct,
  * error success whatever.
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 29f5b65bee29..9788c0ec6f43 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1673,8 +1673,12 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p,
                 ri->rp = rp;
                 ri->task = current;
 
-                if (rp->entry_handler && rp->entry_handler(ri, regs))
+                if (rp->entry_handler && rp->entry_handler(ri, regs)) {
+                        raw_spin_lock_irqsave(&rp->lock, flags);
+                        hlist_add_head(&ri->hlist, &rp->free_instances);
+                        raw_spin_unlock_irqrestore(&rp->lock, flags);
                         return 0;
+                }
 
                 arch_prepare_kretprobe(ri, regs);
 
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 0c4defe6d3b8..21724eee5206 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -231,8 +231,28 @@ extern int pm_test_level;
 #ifdef CONFIG_SUSPEND_FREEZER
 static inline int suspend_freeze_processes(void)
 {
-        int error = freeze_processes();
-        return error ? : freeze_kernel_threads();
+        int error;
+
+        error = freeze_processes();
+
+        /*
+         * freeze_processes() automatically thaws every task if freezing
+         * fails. So we need not do anything extra upon error.
+         */
+        if (error)
+                goto Finish;
+
+        error = freeze_kernel_threads();
+
+        /*
+         * freeze_kernel_threads() thaws only kernel threads upon freezing
+         * failure. So we have to thaw the userspace tasks ourselves.
+         */
+        if (error)
+                thaw_processes();
+
+ Finish:
+        return error;
 }
 
 static inline void suspend_thaw_processes(void)
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 77274c9ba2f1..7e426459e60a 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -143,7 +143,10 @@ int freeze_processes(void)
 /**
  * freeze_kernel_threads - Make freezable kernel threads go to the refrigerator.
  *
- * On success, returns 0.  On failure, -errno and system is fully thawed.
+ * On success, returns 0.  On failure, -errno and only the kernel threads are
+ * thawed, so as to give a chance to the caller to do additional cleanups
+ * (if any) before thawing the userspace tasks. So, it is the responsibility
+ * of the caller to thaw the userspace tasks, when the time is right.
  */
 int freeze_kernel_threads(void)
 {
@@ -159,7 +162,7 @@ int freeze_kernel_threads(void)
         BUG_ON(in_atomic());
 
         if (error)
-                thaw_processes();
+                thaw_kernel_threads();
         return error;
 }
 
@@ -188,3 +191,22 @@ void thaw_processes(void)
         printk("done.\n");
 }
 
+void thaw_kernel_threads(void)
+{
+        struct task_struct *g, *p;
+
+        pm_nosig_freezing = false;
+        printk("Restarting kernel threads ... ");
+
+        thaw_workqueues();
+
+        read_lock(&tasklist_lock);
+        do_each_thread(g, p) {
+                if (p->flags & (PF_KTHREAD | PF_WQ_WORKER))
+                        __thaw_task(p);
+        } while_each_thread(g, p);
+        read_unlock(&tasklist_lock);
+
+        schedule();
+        printk("done.\n");
+}
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 6b1ab7a88522..3e100075b13c 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -249,13 +249,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 }
                 pm_restore_gfp_mask();
                 error = hibernation_snapshot(data->platform_support);
-                if (!error) {
+                if (error) {
+                        thaw_kernel_threads();
+                } else {
                         error = put_user(in_suspend, (int __user *)arg);
                         if (!error && !freezer_test_done)
                                 data->ready = 1;
                         if (freezer_test_done) {
                                 freezer_test_done = false;
-                                thaw_processes();
+                                thaw_kernel_threads();
                         }
                 }
                 break;
@@ -274,6 +276,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 swsusp_free();
                 memset(&data->handle, 0, sizeof(struct snapshot_handle));
                 data->ready = 0;
+                /*
+                 * It is necessary to thaw kernel threads here, because
+                 * SNAPSHOT_CREATE_IMAGE may be invoked directly after
+                 * SNAPSHOT_FREE.  In that case, if kernel threads were not
+                 * thawed, the preallocation of memory carried out by
+                 * hibernation_snapshot() might run into problems (i.e. it
+                 * might fail or even deadlock).
+                 */
+                thaw_kernel_threads();
                 break;
 
         case SNAPSHOT_PREF_IMAGE_SIZE:
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index df00cb09263e..5255c9d2e053 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -74,6 +74,7 @@
 
 #include <asm/tlb.h>
 #include <asm/irq_regs.h>
+#include <asm/mutex.h>
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #endif
@@ -723,9 +724,6 @@ static void dequeue_task(struct rq *rq, struct task_struct *p, int flags)
         p->sched_class->dequeue_task(rq, p, flags);
 }
 
-/*
- * activate_task - move a task to the runqueue.
- */
 void activate_task(struct rq *rq, struct task_struct *p, int flags)
 {
         if (task_contributes_to_load(p))
@@ -734,9 +732,6 @@ void activate_task(struct rq *rq, struct task_struct *p, int flags)
         enqueue_task(rq, p, flags);
 }
 
-/*
- * deactivate_task - remove a task from the runqueue.
- */
 void deactivate_task(struct rq *rq, struct task_struct *p, int flags)
 {
         if (task_contributes_to_load(p))
@@ -4134,7 +4129,7 @@ recheck:
         on_rq = p->on_rq;
         running = task_current(rq, p);
         if (on_rq)
-                deactivate_task(rq, p, 0);
+                dequeue_task(rq, p, 0);
         if (running)
                 p->sched_class->put_prev_task(rq, p);
 
@@ -4147,7 +4142,7 @@ recheck:
         if (running)
                 p->sched_class->set_curr_task(rq);
         if (on_rq)
-                activate_task(rq, p, 0);
+                enqueue_task(rq, p, 0);
 
         check_class_changed(rq, p, prev_class, oldprio);
         task_rq_unlock(rq, p, &flags);
@@ -4998,9 +4993,9 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)
          * placed properly.
          */
         if (p->on_rq) {
-                deactivate_task(rq_src, p, 0);
+                dequeue_task(rq_src, p, 0);
                 set_task_cpu(p, dest_cpu);
-                activate_task(rq_dest, p, 0);
+                enqueue_task(rq_dest, p, 0);
                 check_preempt_curr(rq_dest, p, 0);
         }
 done:
@@ -7032,10 +7027,10 @@ static void normalize_task(struct rq *rq, struct task_struct *p)
 
         on_rq = p->on_rq;
         if (on_rq)
-                deactivate_task(rq, p, 0);
+                dequeue_task(rq, p, 0);
         __setscheduler(rq, p, SCHED_NORMAL, 0);
         if (on_rq) {
-                activate_task(rq, p, 0);
+                enqueue_task(rq, p, 0);
                 resched_task(rq->curr);
         }
 
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 84adb2d66cbd..7c6414fc669d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4866,6 +4866,15 @@ static void nohz_balancer_kick(int cpu)
         return;
 }
 
+static inline void clear_nohz_tick_stopped(int cpu)
+{
+        if (unlikely(test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))) {
+                cpumask_clear_cpu(cpu, nohz.idle_cpus_mask);
+                atomic_dec(&nohz.nr_cpus);
+                clear_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu));
+        }
+}
+
 static inline void set_cpu_sd_state_busy(void)
 {
         struct sched_domain *sd;
@@ -4904,6 +4913,12 @@ void select_nohz_load_balancer(int stop_tick)
 {
         int cpu = smp_processor_id();
 
+        /*
+         * If this cpu is going down, then nothing needs to be done.
+         */
+        if (!cpu_active(cpu))
+                return;
+
         if (stop_tick) {
                 if (test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))
                         return;
@@ -4914,6 +4929,18 @@ void select_nohz_load_balancer(int stop_tick)
         }
         return;
 }
+
+static int __cpuinit sched_ilb_notifier(struct notifier_block *nfb,
+                                        unsigned long action, void *hcpu)
+{
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_DYING:
+                clear_nohz_tick_stopped(smp_processor_id());
+                return NOTIFY_OK;
+        default:
+                return NOTIFY_DONE;
+        }
+}
 #endif
 
 static DEFINE_SPINLOCK(balancing);
@@ -5070,11 +5097,7 @@ static inline int nohz_kick_needed(struct rq *rq, int cpu)
         * busy tick after returning from idle, we will update the busy stats.
         */
         set_cpu_sd_state_busy();
-        if (unlikely(test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))) {
-                clear_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu));
-                cpumask_clear_cpu(cpu, nohz.idle_cpus_mask);
-                atomic_dec(&nohz.nr_cpus);
-        }
+        clear_nohz_tick_stopped(cpu);
 
         /*
          * None are in tickless mode and hence no need for NOHZ idle load
@@ -5590,6 +5613,7 @@ __init void init_sched_fair_class(void)
 
 #ifdef CONFIG_NO_HZ
         zalloc_cpumask_var(&nohz.idle_cpus_mask, GFP_NOWAIT);
+        cpu_notifier(sched_ilb_notifier, 0);
 #endif
 #endif /* SMP */
 
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 3640ebbb466b..f42ae7fb5ec5 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1587,6 +1587,11 @@ static int push_rt_task(struct rq *rq)
         if (!next_task)
                 return 0;
 
+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
+       if (unlikely(task_running(rq, next_task)))
+               return 0;
+#endif
+
 retry:
         if (unlikely(next_task == rq->curr)) {
                 WARN_ON(1);
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 1d7bca7f4f52..d117262deba3 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -296,7 +296,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
                 if (__this_cpu_read(soft_watchdog_warn) == true)
                         return HRTIMER_RESTART;
 
-                printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n",
+                printk(KERN_EMERG "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n",
                         smp_processor_id(), duration,
                         current->comm, task_pid_nr(current));
                 print_modules();
diff --git a/lib/Kconfig b/lib/Kconfig
index 169eb7c598e5..028aba9e72af 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -19,6 +19,9 @@ config RATIONAL
 config GENERIC_FIND_FIRST_BIT
         bool
 
+config NO_GENERIC_PCI_IOPORT_MAP
+        bool
+
 config GENERIC_PCI_IOMAP
         bool
 
@@ -279,6 +282,9 @@ config AVERAGE
 
           If unsure, say N.
 
+config CLZ_TAB
+        bool
+
 config CORDIC
         tristate "CORDIC algorithm"
         help
@@ -287,6 +293,7 @@ config CORDIC
 
 config MPILIB
         tristate
+        select CLZ_TAB
         help
           Multiprecision maths library from GnuPG.
           It is used to implement RSA digital signature verification,
diff --git a/lib/Makefile b/lib/Makefile
index d71aae1b01b3..18515f0267c4 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -121,6 +121,8 @@ obj-$(CONFIG_DQL) += dynamic_queue_limits.o
 obj-$(CONFIG_MPILIB) += mpi/
 obj-$(CONFIG_SIGNATURE) += digsig.o
 
+obj-$(CONFIG_CLZ_TAB) += clz_tab.o
+
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h
 
diff --git a/lib/bug.c b/lib/bug.c
index 19552096d16b..a28c1415357c 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -169,7 +169,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
                 return BUG_TRAP_TYPE_WARN;
         }
 
-        printk(KERN_EMERG "------------[ cut here ]------------\n");
+        printk(KERN_DEFAULT "------------[ cut here ]------------\n");
 
         if (file)
                 printk(KERN_CRIT "kernel BUG at %s:%u!\n",
diff --git a/lib/clz_tab.c b/lib/clz_tab.c
new file mode 100644
index 000000000000..7287b4a991a7
--- /dev/null
+++ b/lib/clz_tab.c
@@ -0,0 +1,18 @@
+const unsigned char __clz_tab[] = {
+        0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
+            5, 5, 5, 5, 5, 5, 5, 5,
+        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+            6, 6, 6, 6, 6, 6, 6, 6,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+            7, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+            7, 7, 7, 7, 7, 7, 7, 7,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8,
+};
diff --git a/lib/digsig.c b/lib/digsig.c
index fd2402f67f89..286d558033e2 100644
--- a/lib/digsig.c
+++ b/lib/digsig.c
@@ -34,14 +34,9 @@ static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg,
                         unsigned long  msglen,
                         unsigned long  modulus_bitlen,
                         unsigned char *out,
-                        unsigned long *outlen,
-                        int *is_valid)
+                        unsigned long *outlen)
 {
         unsigned long modulus_len, ps_len, i;
-        int result;
-
-        /* default to invalid packet */
-        *is_valid = 0;
 
         modulus_len = (modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0);
 
@@ -50,39 +45,30 @@ static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg,
                 return -EINVAL;
 
         /* separate encoded message */
-        if ((msg[0] != 0x00) || (msg[1] != (unsigned char)1)) {
-                result = -EINVAL;
-                goto bail;
-        }
+        if ((msg[0] != 0x00) || (msg[1] != (unsigned char)1))
+                return -EINVAL;
 
         for (i = 2; i < modulus_len - 1; i++)
                 if (msg[i] != 0xFF)
                         break;
 
         /* separator check */
-        if (msg[i] != 0) {
+        if (msg[i] != 0)
                 /* There was no octet with hexadecimal value 0x00
                 to separate ps from m. */
-                result = -EINVAL;
-                goto bail;
-        }
+                return -EINVAL;
 
         ps_len = i - 2;
 
         if (*outlen < (msglen - (2 + ps_len + 1))) {
                 *outlen = msglen - (2 + ps_len + 1);
-                result = -EOVERFLOW;
-                goto bail;
+                return -EOVERFLOW;
         }
 
         *outlen = (msglen - (2 + ps_len + 1));
         memcpy(out, &msg[2 + ps_len + 1], *outlen);
 
-        /* valid packet */
-        *is_valid = 1;
-        result    = 0;
-bail:
-        return result;
+        return 0;
 }
 
 /*
@@ -96,7 +82,7 @@ static int digsig_verify_rsa(struct key *key,
         unsigned long len;
         unsigned long mlen, mblen;
         unsigned nret, l;
-        int valid, head, i;
+        int head, i;
         unsigned char *out1 = NULL, *out2 = NULL;
         MPI in = NULL, res = NULL, pkey[2];
         uint8_t *p, *datap, *endp;
@@ -105,6 +91,10 @@ static int digsig_verify_rsa(struct key *key,
 
         down_read(&key->sem);
         ukp = key->payload.data;
+
+        if (ukp->datalen < sizeof(*pkh))
+                goto err1;
+
         pkh = (struct pubkey_hdr *)ukp->data;
 
         if (pkh->version != 1)
@@ -117,18 +107,23 @@ static int digsig_verify_rsa(struct key *key,
                 goto err1;
 
         datap = pkh->mpi;
-        endp = datap + ukp->datalen;
+        endp = ukp->data + ukp->datalen;
+
+        err = -ENOMEM;
 
         for (i = 0; i < pkh->nmpi; i++) {
                 unsigned int remaining = endp - datap;
                 pkey[i] = mpi_read_from_buffer(datap, &remaining);
+                if (!pkey[i])
+                        goto err;
                 datap += remaining;
         }
 
         mblen = mpi_get_nbits(pkey[0]);
         mlen = (mblen + 7)/8;
 
-        err = -ENOMEM;
+        if (mlen == 0)
+                goto err;
 
         out1 = kzalloc(mlen, GFP_KERNEL);
         if (!out1)
@@ -167,10 +162,9 @@ static int digsig_verify_rsa(struct key *key,
         memset(out1, 0, head);
         memcpy(out1 + head, p, l);
 
-        err = -EINVAL;
-        pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len, &valid);
+        err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len);
 
-        if (valid && len == hlen)
+        if (!err && len == hlen)
                 err = memcmp(out2, h, hlen);
 
 err:
@@ -178,8 +172,8 @@ err:
         mpi_free(res);
         kfree(out1);
         kfree(out2);
-        mpi_free(pkey[0]);
-        mpi_free(pkey[1]);
+        while (--i >= 0)
+                mpi_free(pkey[i]);
 err1:
         up_read(&key->sem);
 
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
index b87487b40a8b..29f98624ef93 100644
--- a/lib/mpi/longlong.h
+++ b/lib/mpi/longlong.h
@@ -1200,18 +1200,40 @@ do { \
         "r" ((USItype)(v)) \
         : "%g1", "%g2" __AND_CLOBBER_CC)
 #define UMUL_TIME 39            /* 39 instructions */
-#endif
-#ifndef udiv_qrnnd
-#ifndef LONGLONG_STANDALONE
+/* It's quite necessary to add this much assembler for the sparc.
+   The default udiv_qrnnd (in C) is more than 10 times slower!  */
 #define udiv_qrnnd(q, r, n1, n0, d) \
-do { USItype __r; \
-        (q) = __udiv_qrnnd(&__r, (n1), (n0), (d)); \
-        (r) = __r; \
-} while (0)
-        extern USItype __udiv_qrnnd();
-#define UDIV_TIME 140
-#endif /* LONGLONG_STANDALONE */
-#endif /* udiv_qrnnd */
+  __asm__ ("! Inlined udiv_qrnnd\n\t"                                   \
+           "mov 32,%%g1\n\t"                                            \
+           "subcc       %1,%2,%%g0\n\t"                                 \
+           "1:  bcs     5f\n\t"                                         \
+           "addxcc %0,%0,%0     ! shift n1n0 and a q-bit in lsb\n\t"    \
+           "sub %1,%2,%1        ! this kills msb of n\n\t"              \
+           "addx        %1,%1,%1        ! so this can't give carry\n\t" \
+           "subcc       %%g1,1,%%g1\n\t"                                \
+           "2:  bne     1b\n\t"                                         \
+           "subcc       %1,%2,%%g0\n\t"                                 \
+           "bcs 3f\n\t"                                                 \
+           "addxcc %0,%0,%0     ! shift n1n0 and a q-bit in lsb\n\t"    \
+           "b           3f\n\t"                                         \
+           "sub %1,%2,%1        ! this kills msb of n\n\t"              \
+           "4:  sub     %1,%2,%1\n\t"                                   \
+           "5:  addxcc  %1,%1,%1\n\t"                                   \
+           "bcc 2b\n\t"                                                 \
+           "subcc       %%g1,1,%%g1\n\t"                                \
+           "! Got carry from n.  Subtract next step to cancel this carry.\n\t" \
+           "bne 4b\n\t"                                                 \
+           "addcc       %0,%0,%0        ! shift n1n0 and a 0-bit in lsb\n\t" \
+           "sub %1,%2,%1\n\t"                                           \
+           "3:  xnor    %0,0,%0\n\t"                                    \
+           "! End of inline udiv_qrnnd\n"                               \
+           : "=&r" ((USItype)(q)),                                      \
+             "=&r" ((USItype)(r))                                       \
+           : "r" ((USItype)(d)),                                        \
+             "1" ((USItype)(n1)),                                       \
+             "0" ((USItype)(n0)) : "%g1", "cc")
+#define UDIV_TIME (3+7*32)      /* 7 instructions/iteration. 32 iterations.  */
+#endif
 #endif /* __sparc__ */
 
 /***************************************
diff --git a/lib/mpi/mpi-bit.c b/lib/mpi/mpi-bit.c
index 854c9c6da025..2f526627e4f5 100644
--- a/lib/mpi/mpi-bit.c
+++ b/lib/mpi/mpi-bit.c
@@ -21,25 +21,6 @@
 #include "mpi-internal.h"
 #include "longlong.h"
 
-const unsigned char __clz_tab[] = {
-        0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
-            5, 5, 5, 5, 5, 5, 5, 5,
-        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-            6, 6, 6, 6, 6, 6, 6, 6,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-};
-
 #define A_LIMB_1 ((mpi_limb_t) 1)
 
 /****************
diff --git a/lib/mpi/mpi-div.c b/lib/mpi/mpi-div.c
index c3087d1390ce..f68cbbb4d4a4 100644
--- a/lib/mpi/mpi-div.c
+++ b/lib/mpi/mpi-div.c
@@ -149,6 +149,9 @@ int mpi_tdiv_qr(MPI quot, MPI rem, MPI num, MPI den)
         mpi_ptr_t marker[5];
         int markidx = 0;
 
+        if (!dsize)
+                return -EINVAL;
+
         memset(marker, 0, sizeof(marker));
 
         /* Ensure space is enough for quotient and remainder.
@@ -207,6 +210,8 @@ int mpi_tdiv_qr(MPI quot, MPI rem, MPI num, MPI den)
                  * numerator would be gradually overwritten by the quotient limbs.  */
                 if (qp == np) { /* Copy NP object to temporary space.  */
                         np = marker[markidx++] = mpi_alloc_limb_space(nsize);
+                        if (!np)
+                                goto nomem;
                         MPN_COPY(np, qp, nsize);
                 }
         } else                  /* Put quotient at top of remainder. */
diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c
index b04a3cf80080..67f3e79af914 100644
--- a/lib/mpi/mpi-pow.c
+++ b/lib/mpi/mpi-pow.c
@@ -59,7 +59,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
         ep = exp->d;
 
         if (!msize)
-                msize = 1 / msize;      /* provoke a signal */
+                return -EINVAL;
 
         if (!esize) {
                 /* Exponent is zero, result is 1 mod MOD, i.e., 1 or 0
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c
index 716802b774ea..f26b41fcb48c 100644
--- a/lib/mpi/mpicoder.c
+++ b/lib/mpi/mpicoder.c
@@ -20,78 +20,15 @@
 
 #include "mpi-internal.h"
 
-#define DIM(v) (sizeof(v)/sizeof((v)[0]))
 #define MAX_EXTERN_MPI_BITS 16384
 
-static uint8_t asn[15] =        /* Object ID is 1.3.14.3.2.26 */
-{ 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03,
-        0x02, 0x1a, 0x05, 0x00, 0x04, 0x14
-};
-
-MPI do_encode_md(const void *sha_buffer, unsigned nbits)
-{
-        int nframe = (nbits + 7) / 8;
-        uint8_t *frame, *fr_pt;
-        int i = 0, n;
-        size_t asnlen = DIM(asn);
-        MPI a = MPI_NULL;
-
-        if (SHA1_DIGEST_LENGTH + asnlen + 4 > nframe)
-                pr_info("MPI: can't encode a %d bit MD into a %d bits frame\n",
-                       (int)(SHA1_DIGEST_LENGTH * 8), (int)nbits);
-
-        /* We encode the MD in this way:
-         *
-         *       0  A PAD(n bytes)   0  ASN(asnlen bytes)  MD(len bytes)
-         *
-         * PAD consists of FF bytes.
-         */
-        frame = kmalloc(nframe, GFP_KERNEL);
-        if (!frame)
-                return MPI_NULL;
-        n = 0;
-        frame[n++] = 0;
-        frame[n++] = 1;         /* block type */
-        i = nframe - SHA1_DIGEST_LENGTH - asnlen - 3;
-
-        if (i <= 1) {
-                pr_info("MPI: message digest encoding failed\n");
-                kfree(frame);
-                return a;
-        }
-
-        memset(frame + n, 0xff, i);
-        n += i;
-        frame[n++] = 0;
-        memcpy(frame + n, &asn, asnlen);
-        n += asnlen;
-        memcpy(frame + n, sha_buffer, SHA1_DIGEST_LENGTH);
-        n += SHA1_DIGEST_LENGTH;
-
-        i = nframe;
-        fr_pt = frame;
-
-        if (n != nframe) {
-                printk
-                    ("MPI: message digest encoding failed, frame length is wrong\n");
-                kfree(frame);
-                return a;
-        }
-
-        a = mpi_alloc((nframe + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB);
-        mpi_set_buffer(a, frame, nframe, 0);
-        kfree(frame);
-
-        return a;
-}
-
 MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)
 {
         const uint8_t *buffer = xbuffer;
         int i, j;
         unsigned nbits, nbytes, nlimbs, nread = 0;
         mpi_limb_t a;
-        MPI val = MPI_NULL;
+        MPI val = NULL;
 
         if (*ret_nread < 2)
                 goto leave;
@@ -108,7 +45,7 @@ MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)
         nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;
         val = mpi_alloc(nlimbs);
         if (!val)
-                return MPI_NULL;
+                return NULL;
         i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
         i %= BYTES_PER_MPI_LIMB;
         val->nbits = nbits;
@@ -212,30 +149,6 @@ int mpi_fromstr(MPI val, const char *str)
 EXPORT_SYMBOL_GPL(mpi_fromstr);
 
 /****************
- * Special function to get the low 8 bytes from an mpi.
- * This can be used as a keyid; KEYID is an 2 element array.
- * Return the low 4 bytes.
- */
-u32 mpi_get_keyid(const MPI a, u32 *keyid)
-{
-#if BYTES_PER_MPI_LIMB == 4
-        if (keyid) {
-                keyid[0] = a->nlimbs >= 2 ? a->d[1] : 0;
-                keyid[1] = a->nlimbs >= 1 ? a->d[0] : 0;
-        }
-        return a->nlimbs >= 1 ? a->d[0] : 0;
-#elif BYTES_PER_MPI_LIMB == 8
-        if (keyid) {
-                keyid[0] = a->nlimbs ? (u32) (a->d[0] >> 32) : 0;
-                keyid[1] = a->nlimbs ? (u32) (a->d[0] & 0xffffffff) : 0;
-        }
-        return a->nlimbs ? (u32) (a->d[0] & 0xffffffff) : 0;
-#else
-#error Make this function work with other LIMB sizes
-#endif
-}
-
-/****************
  * Return an allocated buffer with the MPI (msb first).
  * NBYTES receives the length of this buffer. Caller must free the
  * return string (This function does return a 0 byte buffer with NBYTES
diff --git a/lib/mpi/mpih-div.c b/lib/mpi/mpih-div.c
index 87ede162dfab..cde1aaec18da 100644
--- a/lib/mpi/mpih-div.c
+++ b/lib/mpi/mpih-div.c
@@ -217,6 +217,10 @@ mpihelp_divrem(mpi_ptr_t qp, mpi_size_t qextra_limbs,
         case 0:
                 /* We are asked to divide by zero, so go ahead and do it!  (To make
                    the compiler not remove this statement, return the value.)  */
+                /*
+                 * existing clients of this function have been modified
+                 * not to call it with dsize == 0, so this should not happen
+                 */
                 return 1 / dsize;
 
         case 1:
diff --git a/lib/mpi/mpiutil.c b/lib/mpi/mpiutil.c
index eefc55d6b7f5..26e4ed31e256 100644
--- a/lib/mpi/mpiutil.c
+++ b/lib/mpi/mpiutil.c
@@ -58,6 +58,9 @@ mpi_ptr_t mpi_alloc_limb_space(unsigned nlimbs)
 {
         size_t len = nlimbs * sizeof(mpi_limb_t);
 
+        if (!len)
+                return NULL;
+
         return kmalloc(len, GFP_KERNEL);
 }
 
@@ -135,7 +138,7 @@ int mpi_copy(MPI *copied, const MPI a)
         size_t i;
         MPI b;
 
-        *copied = MPI_NULL;
+        *copied = NULL;
 
         if (a) {
                 b = mpi_alloc(a->nlimbs);
diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c
index 4b0fdc22e688..0d83ea8a9605 100644
--- a/lib/pci_iomap.c
+++ b/lib/pci_iomap.c
@@ -34,7 +34,7 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
         if (maxlen && len > maxlen)
                 len = maxlen;
         if (flags & IORESOURCE_IO)
-                return ioport_map(start, len);
+                return __pci_ioport_map(dev, start, len);
         if (flags & IORESOURCE_MEM) {
                 if (flags & IORESOURCE_CACHEABLE)
                         return ioremap(start, len);
diff --git a/mm/compaction.c b/mm/compaction.c
index 71a58f67f481..d9ebebe1a2aa 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -313,12 +313,34 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
                 } else if (!locked)
                         spin_lock_irq(&zone->lru_lock);
 
+                /*
+                 * migrate_pfn does not necessarily start aligned to a
+                 * pageblock. Ensure that pfn_valid is called when moving
+                 * into a new MAX_ORDER_NR_PAGES range in case of large
+                 * memory holes within the zone
+                 */
+                if ((low_pfn & (MAX_ORDER_NR_PAGES - 1)) == 0) {
+                        if (!pfn_valid(low_pfn)) {
+                                low_pfn += MAX_ORDER_NR_PAGES - 1;
+                                continue;
+                        }
+                }
+
                 if (!pfn_valid_within(low_pfn))
                         continue;
                 nr_scanned++;
 
-                /* Get the page and skip if free */
+                /*
+                 * Get the page and ensure the page is within the same zone.
+                 * See the comment in isolate_freepages about overlapping
+                 * nodes. It is deliberate that the new zone lock is not taken
+                 * as memory compaction should not move pages between nodes.
+                 */
                 page = pfn_to_page(low_pfn);
+                if (page_zone(page) != zone)
+                        continue;
+
+                /* Skip if free */
                 if (PageBuddy(page))
                         continue;
 
diff --git a/mm/filemap.c b/mm/filemap.c
index 97f49ed35bd2..b66275757c28 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1400,15 +1400,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
         unsigned long seg = 0;
         size_t count;
         loff_t *ppos = &iocb->ki_pos;
-        struct blk_plug plug;
 
         count = 0;
         retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
         if (retval)
                 return retval;
 
-        blk_start_plug(&plug);
-
         /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
         if (filp->f_flags & O_DIRECT) {
                 loff_t size;
@@ -1424,8 +1421,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         retval = filemap_write_and_wait_range(mapping, pos,
                                         pos + iov_length(iov, nr_segs) - 1);
                         if (!retval) {
+                                struct blk_plug plug;
+
+                                blk_start_plug(&plug);
                                 retval = mapping->a_ops->direct_IO(READ, iocb,
                                                         iov, pos, nr_segs);
+                                blk_finish_plug(&plug);
                         }
                         if (retval > 0) {
                                 *ppos = pos + retval;
@@ -1481,7 +1482,6 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         break;
         }
 out:
-        blk_finish_plug(&plug);
         return retval;
 }
 EXPORT_SYMBOL(generic_file_aio_read);
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index f91b2f687343..a4eb31132229 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -263,7 +263,12 @@ found:
                                                         xip_pfn);
                 if (err == -ENOMEM)
                         return VM_FAULT_OOM;
-                BUG_ON(err);
+                /*
+                 * err == -EBUSY is fine, we've raced against another thread
+                 * that faulted-in the same page
+                 */
+                if (err != -EBUSY)
+                        BUG_ON(err);
                 return VM_FAULT_NOPAGE;
         } else {
                 int err, ret = VM_FAULT_OOM;
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index b3ffc21ce801..91d3efb25d15 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2083,7 +2083,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot)
 {
         struct mm_struct *mm = mm_slot->mm;
 
-        VM_BUG_ON(!spin_is_locked(&khugepaged_mm_lock));
+        VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock));
 
         if (khugepaged_test_exit(mm)) {
                 /* free mm_slot */
@@ -2113,7 +2113,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
         int progress = 0;
 
         VM_BUG_ON(!pages);
-        VM_BUG_ON(!spin_is_locked(&khugepaged_mm_lock));
+        VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock));
 
         if (khugepaged_scan.mm_slot)
                 mm_slot = khugepaged_scan.mm_slot;
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index c833addd94d7..45eb6217bf38 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1036,7 +1036,7 @@ void __ref kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp)
 {
         pr_debug("%s(0x%p)\n", __func__, ptr);
 
-        if (atomic_read(&kmemleak_enabled) && ptr && !IS_ERR(ptr))
+        if (atomic_read(&kmemleak_enabled) && ptr && size && !IS_ERR(ptr))
                 add_scan_area((unsigned long)ptr, size, gfp);
         else if (atomic_read(&kmemleak_early_log))
                 log_early(KMEMLEAK_SCAN_AREA, ptr, size, 0);
@@ -1757,6 +1757,7 @@ void __init kmemleak_init(void)
 
 #ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF
         if (!kmemleak_skip_disable) {
+                atomic_set(&kmemleak_early_log, 0);
                 kmemleak_disable();
                 return;
         }
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 556859fec4ef..6728a7ae6f2d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -776,7 +776,8 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page)
         /* threshold event is triggered in finer grain than soft limit */
         if (unlikely(mem_cgroup_event_ratelimit(memcg,
                                                 MEM_CGROUP_TARGET_THRESH))) {
-                bool do_softlimit, do_numainfo;
+                bool do_softlimit;
+                bool do_numainfo __maybe_unused;
 
                 do_softlimit = mem_cgroup_event_ratelimit(memcg,
                                                 MEM_CGROUP_TARGET_SOFTLIMIT);
diff --git a/mm/migrate.c b/mm/migrate.c
index 9871a56d82c3..df141f60289e 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -445,7 +445,6 @@ void migrate_page_copy(struct page *newpage, struct page *page)
         ClearPageSwapCache(page);
         ClearPagePrivate(page);
         set_page_private(page, 0);
-        page->mapping = NULL;
 
         /*
          * If any waiters have accumulated on the new page then
@@ -667,6 +666,7 @@ static int move_to_new_page(struct page *newpage, struct page *page,
         } else {
                 if (remap_swapcache)
                         remove_migration_ptes(page, newpage);
+                page->mapping = NULL;
         }
 
         unlock_page(newpage);
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
index e920aa3ce104..c20ff48994c2 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -298,23 +298,18 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
                 goto free_proc_pages;
         }
 
-        task_lock(task);
-        if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
-                task_unlock(task);
-                rc = -EPERM;
-                goto put_task_struct;
-        }
-        mm = task->mm;
-
-        if (!mm || (task->flags & PF_KTHREAD)) {
-                task_unlock(task);
-                rc = -EINVAL;
+        mm = mm_access(task, PTRACE_MODE_ATTACH);
+        if (!mm || IS_ERR(mm)) {
+                rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
+                /*
+                 * Explicitly map EACCES to EPERM as EPERM is a more a
+                 * appropriate error code for process_vw_readv/writev
+                 */
+                if (rc == -EACCES)
+                        rc = -EPERM;
                 goto put_task_struct;
         }
 
-        atomic_inc(&mm->mm_users);
-        task_unlock(task);
-
         for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
                 rc = process_vm_rw_single_vec(
                         (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
diff --git a/mm/swap.c b/mm/swap.c
index b0f529b38979..fff1ff7fb9ad 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -659,7 +659,7 @@ void lru_add_page_tail(struct zone* zone,
         VM_BUG_ON(!PageHead(page));
         VM_BUG_ON(PageCompound(page_tail));
         VM_BUG_ON(PageLRU(page_tail));
-        VM_BUG_ON(!spin_is_locked(&zone->lru_lock));
+        VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&zone->lru_lock));
 
         SetPageLRU(page_tail);
 
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 673728add60b..82c57069415f 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -59,8 +59,6 @@ struct cfcnfg *get_cfcnfg(struct net *net)
 {
         struct caif_net *caifn;
         caifn = net_generic(net, caif_net_id);
-        if (!caifn)
-                return NULL;
         return caifn->cfg;
 }
 EXPORT_SYMBOL(get_cfcnfg);
@@ -69,8 +67,6 @@ static struct caif_device_entry_list *caif_device_list(struct net *net)
 {
         struct caif_net *caifn;
         caifn = net_generic(net, caif_net_id);
-        if (!caifn)
-                return NULL;
         return &caifn->caifdevs;
 }
 
@@ -99,8 +95,6 @@ static struct caif_device_entry *caif_device_alloc(struct net_device *dev)
         struct caif_device_entry *caifd;
 
         caifdevs = caif_device_list(dev_net(dev));
-        if (!caifdevs)
-                return NULL;
 
         caifd = kzalloc(sizeof(*caifd), GFP_KERNEL);
         if (!caifd)
@@ -120,8 +114,6 @@ static struct caif_device_entry *caif_get(struct net_device *dev)
         struct caif_device_entry_list *caifdevs =
             caif_device_list(dev_net(dev));
         struct caif_device_entry *caifd;
-        if (!caifdevs)
-                return NULL;
 
         list_for_each_entry_rcu(caifd, &caifdevs->list, list) {
                 if (caifd->netdev == dev)
@@ -321,8 +313,6 @@ void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,
         struct caif_device_entry_list *caifdevs;
 
         caifdevs = caif_device_list(dev_net(dev));
-        if (!cfg || !caifdevs)
-                return;
         caifd = caif_device_alloc(dev);
         if (!caifd)
                 return;
@@ -374,8 +364,6 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
 
         cfg = get_cfcnfg(dev_net(dev));
         caifdevs = caif_device_list(dev_net(dev));
-        if (!cfg || !caifdevs)
-                return 0;
 
         caifd = caif_get(dev);
         if (caifd == NULL && dev->type != ARPHRD_CAIF)
@@ -507,9 +495,6 @@ static struct notifier_block caif_device_notifier = {
 static int caif_init_net(struct net *net)
 {
         struct caif_net *caifn = net_generic(net, caif_net_id);
-        if (WARN_ON(!caifn))
-                return -EINVAL;
-
         INIT_LIST_HEAD(&caifn->caifdevs.list);
         mutex_init(&caifn->caifdevs.lock);
 
@@ -527,9 +512,6 @@ static void caif_exit_net(struct net *net)
             caif_device_list(net);
         struct cfcnfg *cfg =  get_cfcnfg(net);
 
-        if (!cfg || !caifdevs)
-                return;
-
         rtnl_lock();
         mutex_lock(&caifdevs->lock);
 
@@ -569,7 +551,7 @@ static int __init caif_device_init(void)
 {
         int result;
 
-        result = register_pernet_device(&caif_net_ops);
+        result = register_pernet_subsys(&caif_net_ops);
 
         if (result)
                 return result;
@@ -582,7 +564,7 @@ static int __init caif_device_init(void)
 
 static void __exit caif_device_exit(void)
 {
-        unregister_pernet_device(&caif_net_ops);
+        unregister_pernet_subsys(&caif_net_ops);
         unregister_netdevice_notifier(&caif_device_notifier);
         dev_remove_pack(&caif_packet_type);
 }
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c
index 598aafb4cb51..ba9cfd47778a 100644
--- a/net/caif/cfcnfg.c
+++ b/net/caif/cfcnfg.c
@@ -309,7 +309,6 @@ int caif_connect_client(struct net *net, struct caif_connect_request *conn_req,
         int err;
         struct cfctrl_link_param param;
         struct cfcnfg *cfg = get_cfcnfg(net);
-        caif_assert(cfg != NULL);
 
         rcu_read_lock();
         err = caif_connect_req_to_link_param(cfg, conn_req, &param);
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 97f70e50ad3b..761ad9d6cc3b 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -85,8 +85,6 @@ int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid)
         } else {
                 pr_info("client%lld fsid %pU\n", ceph_client_id(client), fsid);
                 memcpy(&client->fsid, fsid, sizeof(*fsid));
-                ceph_debugfs_client_init(client);
-                client->have_fsid = true;
         }
         return 0;
 }
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 0b62deae42bd..1845cde26227 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -8,8 +8,8 @@
 
 #include <linux/ceph/mon_client.h>
 #include <linux/ceph/libceph.h>
+#include <linux/ceph/debugfs.h>
 #include <linux/ceph/decode.h>
-
 #include <linux/ceph/auth.h>
 
 /*
@@ -340,8 +340,19 @@ static void ceph_monc_handle_map(struct ceph_mon_client *monc,
         client->monc.monmap = monmap;
         kfree(old);
 
+        if (!client->have_fsid) {
+                client->have_fsid = true;
+                mutex_unlock(&monc->mutex);
+                /*
+                 * do debugfs initialization without mutex to avoid
+                 * creating a locking dependency
+                 */
+                ceph_debugfs_client_init(client);
+                goto out_unlocked;
+        }
 out:
         mutex_unlock(&monc->mutex);
+out_unlocked:
         wake_up_all(&client->auth_wq);
 }
 
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index aefcd7acbffa..0e950fda9a0a 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -30,6 +30,20 @@ EXPORT_SYMBOL(init_net);
 
 #define INITIAL_NET_GEN_PTRS    13 /* +1 for len +2 for rcu_head */
 
+static unsigned int max_gen_ptrs = INITIAL_NET_GEN_PTRS;
+
+static struct net_generic *net_alloc_generic(void)
+{
+        struct net_generic *ng;
+        size_t generic_size = offsetof(struct net_generic, ptr[max_gen_ptrs]);
+
+        ng = kzalloc(generic_size, GFP_KERNEL);
+        if (ng)
+                ng->len = max_gen_ptrs;
+
+        return ng;
+}
+
 static int net_assign_generic(struct net *net, int id, void *data)
 {
         struct net_generic *ng, *old_ng;
@@ -43,8 +57,7 @@ static int net_assign_generic(struct net *net, int id, void *data)
         if (old_ng->len >= id)
                 goto assign;
 
-        ng = kzalloc(sizeof(struct net_generic) +
-                        id * sizeof(void *), GFP_KERNEL);
+        ng = net_alloc_generic();
         if (ng == NULL)
                 return -ENOMEM;
 
@@ -59,7 +72,6 @@ static int net_assign_generic(struct net *net, int id, void *data)
          * the old copy for kfree after a grace period.
          */
 
-        ng->len = id;
         memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));
 
         rcu_assign_pointer(net->gen, ng);
@@ -161,18 +173,6 @@ out_undo:
         goto out;
 }
 
-static struct net_generic *net_alloc_generic(void)
-{
-        struct net_generic *ng;
-        size_t generic_size = sizeof(struct net_generic) +
-                INITIAL_NET_GEN_PTRS * sizeof(void *);
-
-        ng = kzalloc(generic_size, GFP_KERNEL);
-        if (ng)
-                ng->len = INITIAL_NET_GEN_PTRS;
-
-        return ng;
-}
 
 #ifdef CONFIG_NET_NS
 static struct kmem_cache *net_cachep;
@@ -483,6 +483,7 @@ again:
                         }
                         return error;
                 }
+                max_gen_ptrs = max_t(unsigned int, max_gen_ptrs, *ops->id);
         }
         error = __register_pernet_operations(list, ops);
         if (error) {
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index f16444bc6cbb..65aebd450027 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1509,6 +1509,9 @@ errout:
 
         if (send_addr_notify)
                 call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
+        min_ifinfo_dump_size = max_t(u16, if_nlmsg_size(dev),
+                                     min_ifinfo_dump_size);
+
         return err;
 }
 
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 2e4e24476c4c..19d66cefd7d3 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -123,11 +123,14 @@ again:
                                                 smallest_size = tb->num_owners;
                                                 smallest_rover = rover;
                                                 if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) {
-                                                        spin_unlock(&head->lock);
                                                         snum = smallest_rover;
-                                                        goto have_snum;
+                                                        goto tb_found;
                                                 }
                                         }
+                                        if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) {
+                                                snum = rover;
+                                                goto tb_found;
+                                        }
                                         goto next;
                                 }
                         break;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 2b53a1f7abf6..6b3ca5ba4450 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -422,6 +422,10 @@ static struct ip_tunnel *ipgre_tunnel_locate(struct net *net,
         if (register_netdevice(dev) < 0)
                 goto failed_free;
 
+        /* Can use a lockless transmit, unless we generate output sequences */
+        if (!(nt->parms.o_flags & GRE_SEQ))
+                dev->features |= NETIF_F_LLTX;
+
         dev_hold(dev);
         ipgre_tunnel_link(ign, nt);
         return nt;
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 4aa7e9dc0cbb..4cb9cd2f2c39 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -814,6 +814,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
 
         net->ipv4.sysctl_rt_cache_rebuild_count = 4;
 
+        tcp_init_mem(net);
         limit = nr_free_buffer_pages() / 8;
         limit = max(limit, 128UL);
         net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 9bcdec3ad772..06373b4a449a 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3216,6 +3216,16 @@ static int __init set_thash_entries(char *str)
 }
 __setup("thash_entries=", set_thash_entries);
 
+void tcp_init_mem(struct net *net)
+{
+        /* Set per-socket limits to no more than 1/128 the pressure threshold */
+        unsigned long limit = nr_free_buffer_pages() / 8;
+        limit = max(limit, 128UL);
+        net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3;
+        net->ipv4.sysctl_tcp_mem[1] = limit;
+        net->ipv4.sysctl_tcp_mem[2] = net->ipv4.sysctl_tcp_mem[0] * 2;
+}
+
 void __init tcp_init(void)
 {
         struct sk_buff *skb = NULL;
@@ -3276,9 +3286,9 @@ void __init tcp_init(void)
         sysctl_tcp_max_orphans = cnt / 2;
         sysctl_max_syn_backlog = max(128, cnt / 256);
 
-        /* Set per-socket limits to no more than 1/128 the pressure threshold */
-        limit = ((unsigned long)init_net.ipv4.sysctl_tcp_mem[1])
-                << (PAGE_SHIFT - 7);
+        tcp_init_mem(&init_net);
+        limit = nr_free_buffer_pages() / 8;
+        limit = max(limit, 128UL);
         max_share = min(4UL*1024*1024, limit);
 
         sysctl_tcp_wmem[0] = SK_MEM_QUANTUM;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8c8de2780c7a..4ff3b6dc74fc 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1141,11 +1141,9 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
         sk_mem_uncharge(sk, len);
         sock_set_flag(sk, SOCK_QUEUE_SHRUNK);
 
-        /* Any change of skb->len requires recalculation of tso
-         * factor and mss.
-         */
+        /* Any change of skb->len requires recalculation of tso factor. */
         if (tcp_skb_pcount(skb) > 1)
-                tcp_set_skb_tso_segs(sk, skb, tcp_current_mss(sk));
+                tcp_set_skb_tso_segs(sk, skb, tcp_skb_mss(skb));
 
         return 0;
 }
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index d21e7ebd91ca..55670ec3cd0f 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -393,11 +393,6 @@ static int l2tp_ip_backlog_recv(struct sock *sk, struct sk_buff *skb)
 {
         int rc;
 
-        if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
-                goto drop;
-
-        nf_reset(skb);
-
         /* Charge it to the socket, dropping if the queue is full. */
         rc = sock_queue_rcv_skb(sk, skb);
         if (rc < 0)
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index b3d76b756cd5..a4643969a13b 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -106,6 +106,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
         sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
 
+        local->oper_channel = chan;
         channel_type = ifibss->channel_type;
         if (channel_type > NL80211_CHAN_HT20 &&
             !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index e47768cb8cb3..01a21c2f6ab3 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1314,6 +1314,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
                         continue;
                 }
                 /* count everything else */
+                sdata->vif.bss_conf.idle = false;
                 count++;
         }
 
diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c
index 1426ec3d0a53..75762f346975 100644
--- a/net/sunrpc/auth_generic.c
+++ b/net/sunrpc/auth_generic.c
@@ -92,6 +92,7 @@ generic_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
         if (gcred->acred.group_info != NULL)
                 get_group_info(gcred->acred.group_info);
         gcred->acred.machine_cred = acred->machine_cred;
+        gcred->acred.principal = acred->principal;
 
         dprintk("RPC:       allocated %s cred %p for uid %d gid %d\n",
                         gcred->acred.machine_cred ? "machine" : "generic",
@@ -123,6 +124,17 @@ generic_destroy_cred(struct rpc_cred *cred)
         call_rcu(&cred->cr_rcu, generic_free_cred_callback);
 }
 
+static int
+machine_cred_match(struct auth_cred *acred, struct generic_cred *gcred, int flags)
+{
+        if (!gcred->acred.machine_cred ||
+            gcred->acred.principal != acred->principal ||
+            gcred->acred.uid != acred->uid ||
+            gcred->acred.gid != acred->gid)
+                return 0;
+        return 1;
+}
+
 /*
  * Match credentials against current process creds.
  */
@@ -132,9 +144,12 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags)
         struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base);
         int i;
 
+        if (acred->machine_cred)
+                return machine_cred_match(acred, gcred, flags);
+
         if (gcred->acred.uid != acred->uid ||
             gcred->acred.gid != acred->gid ||
-            gcred->acred.machine_cred != acred->machine_cred)
+            gcred->acred.machine_cred != 0)
                 goto out_nomatch;
 
         /* Optimisation in the case where pointers are identical... */
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index aad8fb699989..85d3bb7490aa 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1918,7 +1918,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 struct sk_buff *skb;
 
                 unix_state_lock(sk);
-                skb = skb_dequeue(&sk->sk_receive_queue);
+                skb = skb_peek(&sk->sk_receive_queue);
                 if (skb == NULL) {
                         unix_sk(sk)->recursion_level = 0;
                         if (copied >= target)
@@ -1958,11 +1958,8 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 if (check_creds) {
                         /* Never glue messages from different writers */
                         if ((UNIXCB(skb).pid  != siocb->scm->pid) ||
-                            (UNIXCB(skb).cred != siocb->scm->cred)) {
-                                skb_queue_head(&sk->sk_receive_queue, skb);
-                                sk->sk_data_ready(sk, skb->len);
+                            (UNIXCB(skb).cred != siocb->scm->cred))
                                 break;
-                        }
                 } else {
                         /* Copy credentials */
                         scm_set_cred(siocb->scm, UNIXCB(skb).pid, UNIXCB(skb).cred);
@@ -1977,8 +1974,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
 
                 chunk = min_t(unsigned int, skb->len, size);
                 if (memcpy_toiovec(msg->msg_iov, skb->data, chunk)) {
-                        skb_queue_head(&sk->sk_receive_queue, skb);
-                        sk->sk_data_ready(sk, skb->len);
                         if (copied == 0)
                                 copied = -EFAULT;
                         break;
@@ -1993,13 +1988,10 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         if (UNIXCB(skb).fp)
                                 unix_detach_fds(siocb->scm, skb);
 
-                        /* put the skb back if we didn't use it up.. */
-                        if (skb->len) {
-                                skb_queue_head(&sk->sk_receive_queue, skb);
-                                sk->sk_data_ready(sk, skb->len);
+                        if (skb->len)
                                 break;
-                        }
 
+                        skb_unlink(skb, &sk->sk_receive_queue);
                         consume_skb(skb);
 
                         if (siocb->scm->fp)
@@ -2010,9 +2002,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         if (UNIXCB(skb).fp)
                                 siocb->scm->fp = scm_fp_dup(UNIXCB(skb).fp);
 
-                        /* put message back and return */
-                        skb_queue_head(&sk->sk_receive_queue, skb);
-                        sk->sk_data_ready(sk, skb->len);
                         break;
                 }
         } while (size);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e3bfcbe8a520..a3b9782441f9 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1924,6 +1924,12 @@ sub process {
                         my $pre_ctx = "$1$2";
 
                         my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0);
+
+                        if ($line =~ /^\+\t{6,}/) {
+                                WARN("DEEP_INDENTATION",
+                                     "Too many leading tabs - consider code refactoring\n" . $herecurr);
+                        }
+
                         my $ctx_cnt = $realcnt - $#ctx - 1;
                         my $ctx = join("\n", @ctx);
 
diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index e09f144177f5..c99c6078be33 100644
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -22,7 +22,6 @@
 #include "emu8000_local.h"
 #include <asm/uaccess.h>
 #include <linux/moduleparam.h>
-#include <linux/moduleparam.h>
 
 static int emu8000_reset_addr;
 module_param(emu8000_reset_addr, int, 0444);
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 4df72c0e8c37..c2c65f63bf06 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1447,7 +1447,7 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
                 for (i = 0; i < c->cvt_setups.used; i++) {
                         p = snd_array_elem(&c->cvt_setups, i);
                         if (!p->active && p->stream_tag == stream_tag &&
-                            get_wcaps_type(get_wcaps(codec, p->nid)) == type)
+                            get_wcaps_type(get_wcaps(c, p->nid)) == type)
                                 p->dirty = 1;
                 }
         }
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index d8a35da0803f..9d819c4b4923 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -282,7 +282,8 @@ int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
 EXPORT_SYMBOL_HDA(snd_hda_jack_add_kctl);
 
 static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
-                         const struct auto_pin_cfg *cfg)
+                         const struct auto_pin_cfg *cfg,
+                         char *lastname, int *lastidx)
 {
         unsigned int def_conf, conn;
         char name[44];
@@ -298,6 +299,10 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
                 return 0;
 
         snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx);
+        if (!strcmp(name, lastname) && idx == *lastidx)
+                idx++;
+        strncpy(lastname, name, 44);
+        *lastidx = idx;
         err = snd_hda_jack_add_kctl(codec, nid, name, idx);
         if (err < 0)
                 return err;
@@ -311,41 +316,42 @@ int snd_hda_jack_add_kctls(struct hda_codec *codec,
                            const struct auto_pin_cfg *cfg)
 {
         const hda_nid_t *p;
-        int i, err;
+        int i, err, lastidx = 0;
+        char lastname[44] = "";
 
         for (i = 0, p = cfg->line_out_pins; i < cfg->line_outs; i++, p++) {
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->hp_pins; i < cfg->hp_outs; i++, p++) {
                 if (*p == *cfg->line_out_pins) /* might be duplicated */
                         break;
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->speaker_pins; i < cfg->speaker_outs; i++, p++) {
                 if (*p == *cfg->line_out_pins) /* might be duplicated */
                         break;
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
         for (i = 0; i < cfg->num_inputs; i++) {
-                err = add_jack_kctl(codec, cfg->inputs[i].pin, cfg);
+                err = add_jack_kctl(codec, cfg->inputs[i].pin, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->dig_out_pins; i < cfg->dig_outs; i++, p++) {
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
-        err = add_jack_kctl(codec, cfg->dig_in_pin, cfg);
+        err = add_jack_kctl(codec, cfg->dig_in_pin, cfg, lastname, &lastidx);
         if (err < 0)
                 return err;
-        err = add_jack_kctl(codec, cfg->mono_out_pin, cfg);
+        err = add_jack_kctl(codec, cfg->mono_out_pin, cfg, lastname, &lastidx);
         if (err < 0)
                 return err;
         return 0;
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 35abe3c62908..21d91d580da8 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -728,18 +728,19 @@ static int ca0132_hp_switch_put(struct snd_kcontrol *kcontrol,
 
         err = chipio_read(codec, REG_CODEC_MUTE, &data);
         if (err < 0)
-                return err;
+                goto exit;
 
         /* *valp 0 is mute, 1 is unmute */
         data = (data & 0x7f) | (*valp ? 0 : 0x80);
-        chipio_write(codec, REG_CODEC_MUTE, data);
+        err = chipio_write(codec, REG_CODEC_MUTE, data);
         if (err < 0)
-                return err;
+                goto exit;
 
         spec->curr_hp_switch = *valp;
 
+ exit:
         snd_hda_power_down(codec);
-        return 1;
+        return err < 0 ? err : 1;
 }
 
 static int ca0132_speaker_switch_get(struct snd_kcontrol *kcontrol,
@@ -770,18 +771,19 @@ static int ca0132_speaker_switch_put(struct snd_kcontrol *kcontrol,
 
         err = chipio_read(codec, REG_CODEC_MUTE, &data);
         if (err < 0)
-                return err;
+                goto exit;
 
         /* *valp 0 is mute, 1 is unmute */
         data = (data & 0xef) | (*valp ? 0 : 0x10);
-        chipio_write(codec, REG_CODEC_MUTE, data);
+        err = chipio_write(codec, REG_CODEC_MUTE, data);
         if (err < 0)
-                return err;
+                goto exit;
 
         spec->curr_speaker_switch = *valp;
 
+ exit:
         snd_hda_power_down(codec);
-        return 1;
+        return err < 0 ? err : 1;
 }
 
 static int ca0132_hp_volume_get(struct snd_kcontrol *kcontrol,
@@ -819,25 +821,26 @@ static int ca0132_hp_volume_put(struct snd_kcontrol *kcontrol,
 
         err = chipio_read(codec, REG_CODEC_HP_VOL_L, &data);
         if (err < 0)
-                return err;
+                goto exit;
 
         val = 31 - left_vol;
         data = (data & 0xe0) | val;
-        chipio_write(codec, REG_CODEC_HP_VOL_L, data);
+        err = chipio_write(codec, REG_CODEC_HP_VOL_L, data);
         if (err < 0)
-                return err;
+                goto exit;
 
         val = 31 - right_vol;
         data = (data & 0xe0) | val;
-        chipio_write(codec, REG_CODEC_HP_VOL_R, data);
+        err = chipio_write(codec, REG_CODEC_HP_VOL_R, data);
         if (err < 0)
-                return err;
+                goto exit;
 
         spec->curr_hp_volume[0] = left_vol;
         spec->curr_hp_volume[1] = right_vol;
 
+ exit:
         snd_hda_power_down(codec);
-        return 1;
+        return err < 0 ? err : 1;
 }
 
 static int add_hp_switch(struct hda_codec *codec, hda_nid_t nid)
@@ -936,6 +939,8 @@ static int ca0132_build_controls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
                 err = add_in_volume(codec, spec->dig_in, "IEC958");
+                if (err < 0)
+                        return err;
         }
         return 0;
 }
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 0e99357e822c..bc5a993d1146 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -988,8 +988,10 @@ static void cs_automic(struct hda_codec *codec)
                         change_cur_input(codec, !spec->automic_idx, 0);
         } else {
                 if (present) {
-                        spec->last_input = spec->cur_input;
-                        spec->cur_input = spec->automic_idx;
+                        if (spec->cur_input != spec->automic_idx) {
+                                spec->last_input = spec->cur_input;
+                                spec->cur_input = spec->automic_idx;
+                        }
                 } else  {
                         spec->cur_input = spec->last_input;
                 }
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0db1dc49382b..9350f3c3bdf8 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -177,6 +177,7 @@ struct alc_spec {
         unsigned int detect_lo:1;       /* Line-out detection enabled */
         unsigned int automute_speaker_possible:1; /* there are speakers and either LO or HP */
         unsigned int automute_lo_possible:1;      /* there are line outs and HP */
+        unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */
 
         /* other flags */
         unsigned int no_analog :1; /* digital I/O only */
@@ -495,13 +496,24 @@ static void do_automute(struct hda_codec *codec, int num_pins, hda_nid_t *pins,
 
         for (i = 0; i < num_pins; i++) {
                 hda_nid_t nid = pins[i];
+                unsigned int val;
                 if (!nid)
                         break;
                 switch (spec->automute_mode) {
                 case ALC_AUTOMUTE_PIN:
+                        /* don't reset VREF value in case it's controlling
+                         * the amp (see alc861_fixup_asus_amp_vref_0f())
+                         */
+                        if (spec->keep_vref_in_automute) {
+                                val = snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                                val &= ~PIN_HP;
+                        } else
+                                val = 0;
+                        val |= pin_bits;
                         snd_hda_codec_write(codec, nid, 0,
                                             AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            pin_bits);
+                                            val);
                         break;
                 case ALC_AUTOMUTE_AMP:
                         snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
@@ -1843,6 +1855,8 @@ static const char * const alc_slave_vols[] = {
         "Speaker Playback Volume",
         "Mono Playback Volume",
         "Line-Out Playback Volume",
+        "CLFE Playback Volume",
+        "Bass Speaker Playback Volume",
         "PCM Playback Volume",
         NULL,
 };
@@ -1858,6 +1872,8 @@ static const char * const alc_slave_sws[] = {
         "Mono Playback Switch",
         "IEC958 Playback Switch",
         "Line-Out Playback Switch",
+        "CLFE Playback Switch",
+        "Bass Speaker Playback Switch",
         "PCM Playback Switch",
         NULL,
 };
@@ -2306,7 +2322,7 @@ static int alc_build_pcms(struct hda_codec *codec)
                  "%s Analog", codec->chip_name);
         info->name = spec->stream_name_analog;
 
-        if (spec->multiout.dac_nids > 0) {
+        if (spec->multiout.num_dacs > 0) {
                 p = spec->stream_analog_playback;
                 if (!p)
                         p = &alc_pcm_analog_playback;
@@ -4735,7 +4751,6 @@ enum {
         ALC262_FIXUP_FSC_H270,
         ALC262_FIXUP_HP_Z200,
         ALC262_FIXUP_TYAN,
-        ALC262_FIXUP_TOSHIBA_RX1,
         ALC262_FIXUP_LENOVO_3000,
         ALC262_FIXUP_BENQ,
         ALC262_FIXUP_BENQ_T31,
@@ -4765,16 +4780,6 @@ static const struct alc_fixup alc262_fixups[] = {
                         { }
                 }
         },
-        [ALC262_FIXUP_TOSHIBA_RX1] = {
-                .type = ALC_FIXUP_PINS,
-                .v.pins = (const struct alc_pincfg[]) {
-                        { 0x14, 0x90170110 }, /* speaker */
-                        { 0x15, 0x0421101f }, /* HP */
-                        { 0x1a, 0x40f000f0 }, /* N/A */
-                        { 0x1b, 0x40f000f0 }, /* N/A */
-                        { 0x1e, 0x40f000f0 }, /* N/A */
-                }
-        },
         [ALC262_FIXUP_LENOVO_3000] = {
                 .type = ALC_FIXUP_VERBS,
                 .v.verbs = (const struct hda_verb[]) {
@@ -4807,8 +4812,6 @@ static const struct snd_pci_quirk alc262_fixup_tbl[] = {
         SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FIXUP_BENQ),
         SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FIXUP_BENQ),
         SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_FIXUP_TYAN),
-        SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
-                      ALC262_FIXUP_TOSHIBA_RX1),
         SND_PCI_QUIRK(0x1734, 0x1147, "FSC Celsius H270", ALC262_FIXUP_FSC_H270),
         SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000", ALC262_FIXUP_LENOVO_3000),
         SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_FIXUP_BENQ),
@@ -5377,7 +5380,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
                       ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1013, "ASUS N61Da", ALC269_FIXUP_AMIC),
-        SND_PCI_QUIRK(0x1043, 0x1113, "ASUS N63Jn", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1143, "ASUS B53f", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1183, "ASUS K72DR", ALC269_FIXUP_AMIC),
@@ -5589,6 +5591,25 @@ enum {
         PINFIX_ASUS_A6RP,
 };
 
+/* On some laptops, VREF of pin 0x0f is abused for controlling the main amp */
+static void alc861_fixup_asus_amp_vref_0f(struct hda_codec *codec,
+                        const struct alc_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int val;
+
+        if (action != ALC_FIXUP_ACT_INIT)
+                return;
+        val = snd_hda_codec_read(codec, 0x0f, 0,
+                                 AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+        if (!(val & (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN)))
+                val |= AC_PINCTL_IN_EN;
+        val |= AC_PINCTL_VREF_50;
+        snd_hda_codec_write(codec, 0x0f, 0,
+                            AC_VERB_SET_PIN_WIDGET_CONTROL, val);
+        spec->keep_vref_in_automute = 1;
+}
+
 static const struct alc_fixup alc861_fixups[] = {
         [PINFIX_FSC_AMILO_PI1505] = {
                 .type = ALC_FIXUP_PINS,
@@ -5599,17 +5620,14 @@ static const struct alc_fixup alc861_fixups[] = {
                 }
         },
         [PINFIX_ASUS_A6RP] = {
-                .type = ALC_FIXUP_VERBS,
-                .v.verbs = (const struct hda_verb[]) {
-                        /* node 0x0f VREF seems controlling the master output */
-                        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
-                        { }
-                },
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc861_fixup_asus_amp_vref_0f,
         },
 };
 
 static const struct snd_pci_quirk alc861_fixup_tbl[] = {
-        SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", PINFIX_ASUS_A6RP),
+        SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", PINFIX_ASUS_A6RP),
+        SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", PINFIX_ASUS_A6RP),   
         SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP),
         SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),
         {}
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 03e63fed9caf..284e311040fe 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -199,6 +199,9 @@ struct via_spec {
         unsigned int no_pin_power_ctl;
         enum VIA_HDA_CODEC codec_type;
 
+        /* analog low-power control */
+        bool alc_mode;
+
         /* smart51 setup */
         unsigned int smart51_nums;
         hda_nid_t smart51_pins[2];
@@ -687,6 +690,15 @@ static void via_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+static void update_power_state(struct hda_codec *codec, hda_nid_t nid,
+                               unsigned int parm)
+{
+        if (snd_hda_codec_read(codec, nid, 0,
+                               AC_VERB_GET_POWER_STATE, 0) == parm)
+                return;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);
+}
+
 static void set_pin_power_state(struct hda_codec *codec, hda_nid_t nid,
                                 unsigned int *affected_parm)
 {
@@ -709,7 +721,7 @@ static void set_pin_power_state(struct hda_codec *codec, hda_nid_t nid,
         } else
                 parm = AC_PWRST_D3;
 
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, nid, parm);
 }
 
 static int via_pin_power_ctl_info(struct snd_kcontrol *kcontrol,
@@ -749,6 +761,7 @@ static int via_pin_power_ctl_put(struct snd_kcontrol *kcontrol,
                 return 0;
         spec->no_pin_power_ctl = val;
         set_widgets_power_state(codec);
+        analog_low_current_mode(codec);
         return 1;
 }
 
@@ -1036,13 +1049,19 @@ static bool is_aa_path_mute(struct hda_codec *codec)
 }
 
 /* enter/exit analog low-current mode */
-static void analog_low_current_mode(struct hda_codec *codec)
+static void __analog_low_current_mode(struct hda_codec *codec, bool force)
 {
         struct via_spec *spec = codec->spec;
         bool enable;
         unsigned int verb, parm;
 
-        enable = is_aa_path_mute(codec) && (spec->opened_streams != 0);
+        if (spec->no_pin_power_ctl)
+                enable = false;
+        else
+                enable = is_aa_path_mute(codec) && !spec->opened_streams;
+        if (enable == spec->alc_mode && !force)
+                return;
+        spec->alc_mode = enable;
 
         /* decide low current mode's verb & parameter */
         switch (spec->codec_type) {
@@ -1074,6 +1093,11 @@ static void analog_low_current_mode(struct hda_codec *codec)
         snd_hda_codec_write(codec, codec->afg, 0, verb, parm);
 }
 
+static void analog_low_current_mode(struct hda_codec *codec)
+{
+        return __analog_low_current_mode(codec, false);
+}
+
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -1446,6 +1470,7 @@ static int via_build_controls(struct hda_codec *codec)
         struct snd_kcontrol *kctl;
         int err, i;
 
+        spec->no_pin_power_ctl = 1;
         if (spec->set_widgets_power_state)
                 if (!via_clone_control(spec, &via_pin_power_ctl_enum))
                         return -ENOMEM;
@@ -1499,10 +1524,6 @@ static int via_build_controls(struct hda_codec *codec)
                         return err;
         }
 
-        /* init power states */
-        set_widgets_power_state(codec);
-        analog_low_current_mode(codec);
-
         via_free_kctls(codec); /* no longer needed */
 
         err = snd_hda_jack_add_kctls(codec, &spec->autocfg);
@@ -2295,10 +2316,7 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
 
         if (mux) {
                 /* switch to D0 beofre change index */
-                if (snd_hda_codec_read(codec, mux, 0,
-                               AC_VERB_GET_POWER_STATE, 0x00) != AC_PWRST_D0)
-                        snd_hda_codec_write(codec, mux, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, mux, AC_PWRST_D0);
                 snd_hda_codec_write(codec, mux, 0,
                                     AC_VERB_SET_CONNECT_SEL,
                                     spec->inputs[cur].mux_idx);
@@ -2776,6 +2794,10 @@ static int via_init(struct hda_codec *codec)
         for (i = 0; i < spec->num_iverbs; i++)
                 snd_hda_sequence_write(codec, spec->init_verbs[i]);
 
+        /* init power states */
+        set_widgets_power_state(codec);
+        __analog_low_current_mode(codec, true);
+
         via_auto_init_multi_out(codec);
         via_auto_init_hp_out(codec);
         via_auto_init_speaker_out(codec);
@@ -2922,9 +2944,9 @@ static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
         if (imux_is_smixer)
                 parm = AC_PWRST_D0;
         /* SW0 (17h), AIW 0/1 (13h/14h) */
-        snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x17, parm);
+        update_power_state(codec, 0x13, parm);
+        update_power_state(codec, 0x14, parm);
 
         /* outputs */
         /* PW0 (19h), SW1 (18h), AOW1 (11h) */
@@ -2932,8 +2954,8 @@ static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
         set_pin_power_state(codec, 0x19, &parm);
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x1b, &parm);
-        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x18, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* PW6 (22h), SW2 (26h), AOW2 (24h) */
         if (is_8ch) {
@@ -2941,20 +2963,16 @@ static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
                 set_pin_power_state(codec, 0x22, &parm);
                 if (spec->smart51_enabled)
                         set_pin_power_state(codec, 0x1a, &parm);
-                snd_hda_codec_write(codec, 0x26, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x24, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x26, parm);
+                update_power_state(codec, 0x24, parm);
         } else if (codec->vendor_id == 0x11064397) {
                 /* PW7(23h), SW2(27h), AOW2(25h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x23, &parm);
                 if (spec->smart51_enabled)
                         set_pin_power_state(codec, 0x1a, &parm);
-                snd_hda_codec_write(codec, 0x27, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x25, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x27, parm);
+                update_power_state(codec, 0x25, parm);
         }
 
         /* PW 3/4/7 (1ch/1dh/23h) */
@@ -2966,17 +2984,13 @@ static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
                 set_pin_power_state(codec, 0x23, &parm);
 
         /* MW0 (16h), Sw3 (27h), AOW 0/3 (10h/25h) */
-        snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
-                            imux_is_smixer ? AC_PWRST_D0 : parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x16, imux_is_smixer ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x10, parm);
         if (is_8ch) {
-                snd_hda_codec_write(codec, 0x25, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x27, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x25, parm);
+                update_power_state(codec, 0x27, parm);
         } else if (codec->vendor_id == 0x11064397 && spec->hp_independent_mode)
-                snd_hda_codec_write(codec, 0x25, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x25, parm);
 }
 
 static int patch_vt1708S(struct hda_codec *codec);
@@ -3149,10 +3163,10 @@ static void set_widgets_power_state_vt1702(struct hda_codec *codec)
         if (imux_is_smixer)
                 parm = AC_PWRST_D0; /* SW0 (13h) = stereo mixer (idx 3) */
         /* SW0 (13h), AIW 0/1/2 (12h/1fh/20h) */
-        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x12, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x13, parm);
+        update_power_state(codec, 0x12, parm);
+        update_power_state(codec, 0x1f, parm);
+        update_power_state(codec, 0x20, parm);
 
         /* outputs */
         /* PW 3/4 (16h/17h) */
@@ -3160,10 +3174,9 @@ static void set_widgets_power_state_vt1702(struct hda_codec *codec)
         set_pin_power_state(codec, 0x17, &parm);
         set_pin_power_state(codec, 0x16, &parm);
         /* MW0 (1ah), AOW 0/1 (10h/1dh) */
-        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,
-                            imux_is_smixer ? AC_PWRST_D0 : parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1a, imux_is_smixer ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x10, parm);
+        update_power_state(codec, 0x1d, parm);
 }
 
 static int patch_vt1702(struct hda_codec *codec)
@@ -3228,52 +3241,48 @@ static void set_widgets_power_state_vt1718S(struct hda_codec *codec)
         if (imux_is_smixer)
                 parm = AC_PWRST_D0;
         /* MUX6/7 (1eh/1fh), AIW 0/1 (10h/11h) */
-        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1e, parm);
+        update_power_state(codec, 0x1f, parm);
+        update_power_state(codec, 0x10, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* outputs */
         /* PW3 (27h), MW2 (1ah), AOW3 (bh) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x27, &parm);
-        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0xb, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1a, parm);
+        update_power_state(codec, 0xb, parm);
 
         /* PW2 (26h), AOW2 (ah) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x26, &parm);
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x2b, &parm);
-        snd_hda_codec_write(codec, 0xa, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0xa, parm);
 
         /* PW0 (24h), AOW0 (8h) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x24, &parm);
         if (!spec->hp_independent_mode) /* check for redirected HP */
                 set_pin_power_state(codec, 0x28, &parm);
-        snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x8, parm);
         /* MW9 (21h), Mw2 (1ah), AOW0 (8h) */
-        snd_hda_codec_write(codec, 0x21, 0, AC_VERB_SET_POWER_STATE,
-                            imux_is_smixer ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x21, imux_is_smixer ? AC_PWRST_D0 : parm);
 
         /* PW1 (25h), AOW1 (9h) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x25, &parm);
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x2a, &parm);
-        snd_hda_codec_write(codec, 0x9, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x9, parm);
 
         if (spec->hp_independent_mode) {
                 /* PW4 (28h), MW3 (1bh), MUX1(34h), AOW4 (ch) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x28, &parm);
-                snd_hda_codec_write(codec, 0x1b, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x34, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0xc, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x1b, parm);
+                update_power_state(codec, 0x34, parm);
+                update_power_state(codec, 0xc, parm);
         }
 }
 
@@ -3433,8 +3442,8 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         if (imux_is_smixer)
                 parm = AC_PWRST_D0;
         /* SW0 (17h), AIW0(13h) */
-        snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x17, parm);
+        update_power_state(codec, 0x13, parm);
 
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x1e, &parm);
@@ -3442,12 +3451,11 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         if (spec->dmic_enabled)
                 set_pin_power_state(codec, 0x22, &parm);
         else
-                snd_hda_codec_write(codec, 0x22, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                update_power_state(codec, 0x22, AC_PWRST_D3);
 
         /* SW2(26h), AIW1(14h) */
-        snd_hda_codec_write(codec, 0x26, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x26, parm);
+        update_power_state(codec, 0x14, parm);
 
         /* outputs */
         /* PW0 (19h), SW1 (18h), AOW1 (11h) */
@@ -3456,8 +3464,8 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         /* Smart 5.1 PW2(1bh) */
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x1b, &parm);
-        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x18, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* PW7 (23h), SW3 (27h), AOW3 (25h) */
         parm = AC_PWRST_D3;
@@ -3465,12 +3473,12 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         /* Smart 5.1 PW1(1ah) */
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x1a, &parm);
-        snd_hda_codec_write(codec, 0x27, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x27, parm);
 
         /* Smart 5.1 PW5(1eh) */
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x1e, &parm);
-        snd_hda_codec_write(codec, 0x25, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x25, parm);
 
         /* Mono out */
         /* SW4(28h)->MW1(29h)-> PW12 (2ah)*/
@@ -3486,9 +3494,9 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
                         mono_out = 1;
         }
         parm = mono_out ? AC_PWRST_D0 : AC_PWRST_D3;
-        snd_hda_codec_write(codec, 0x28, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x29, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x2a, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x28, parm);
+        update_power_state(codec, 0x29, parm);
+        update_power_state(codec, 0x2a, parm);
 
         /* PW 3/4 (1ch/1dh) */
         parm = AC_PWRST_D3;
@@ -3496,15 +3504,12 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         set_pin_power_state(codec, 0x1d, &parm);
         /* HP Independent Mode, power on AOW3 */
         if (spec->hp_independent_mode)
-                snd_hda_codec_write(codec, 0x25, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x25, parm);
 
         /* force to D0 for internal Speaker */
         /* MW0 (16h), AOW0 (10h) */
-        snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
-                            imux_is_smixer ? AC_PWRST_D0 : parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
-                            mono_out ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x16, imux_is_smixer ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x10, mono_out ? AC_PWRST_D0 : parm);
 }
 
 static int patch_vt1716S(struct hda_codec *codec)
@@ -3580,54 +3585,45 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
         set_pin_power_state(codec, 0x2b, &parm);
         parm = AC_PWRST_D0;
         /* MUX9/10 (1eh/1fh), AIW 0/1 (10h/11h) */
-        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1e, parm);
+        update_power_state(codec, 0x1f, parm);
+        update_power_state(codec, 0x10, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* outputs */
         /* AOW0 (8h)*/
-        snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x8, parm);
 
         if (spec->codec_type == VT1802) {
                 /* PW4 (28h), MW4 (18h), MUX4(38h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x28, &parm);
-                snd_hda_codec_write(codec, 0x18, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x38, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x18, parm);
+                update_power_state(codec, 0x38, parm);
         } else {
                 /* PW4 (26h), MW4 (1ch), MUX4(37h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x26, &parm);
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x37, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x1c, parm);
+                update_power_state(codec, 0x37, parm);
         }
 
         if (spec->codec_type == VT1802) {
                 /* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x25, &parm);
-                snd_hda_codec_write(codec, 0x15, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x35, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x15, parm);
+                update_power_state(codec, 0x35, parm);
         } else {
                 /* PW1 (25h), MW1 (19h), MUX1(35h), AOW1 (9h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x25, &parm);
-                snd_hda_codec_write(codec, 0x19, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x35, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x19, parm);
+                update_power_state(codec, 0x35, parm);
         }
 
         if (spec->hp_independent_mode)
-                snd_hda_codec_write(codec, 0x9, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x9, AC_PWRST_D0);
 
         /* Class-D */
         /* PW0 (24h), MW0(18h/14h), MUX0(34h) */
@@ -3637,12 +3633,10 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
         set_pin_power_state(codec, 0x24, &parm);
         parm = present ? AC_PWRST_D3 : AC_PWRST_D0;
         if (spec->codec_type == VT1802)
-                snd_hda_codec_write(codec, 0x14, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x14, parm);
         else
-                snd_hda_codec_write(codec, 0x18, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x34, 0, AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x18, parm);
+        update_power_state(codec, 0x34, parm);
 
         /* Mono Out */
         present = snd_hda_jack_detect(codec, 0x26);
@@ -3650,28 +3644,20 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
         parm = present ? AC_PWRST_D3 : AC_PWRST_D0;
         if (spec->codec_type == VT1802) {
                 /* PW15 (33h), MW8(1ch), MUX8(3ch) */
-                snd_hda_codec_write(codec, 0x33, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x3c, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x33, parm);
+                update_power_state(codec, 0x1c, parm);
+                update_power_state(codec, 0x3c, parm);
         } else {
                 /* PW15 (31h), MW8(17h), MUX8(3bh) */
-                snd_hda_codec_write(codec, 0x31, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x17, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x3b, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x31, parm);
+                update_power_state(codec, 0x17, parm);
+                update_power_state(codec, 0x3b, parm);
         }
         /* MW9 (21h) */
         if (imux_is_smixer || !is_aa_path_mute(codec))
-                snd_hda_codec_write(codec, 0x21, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x21, AC_PWRST_D0);
         else
-                snd_hda_codec_write(codec, 0x21, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                update_power_state(codec, 0x21, AC_PWRST_D3);
 }
 
 /* patch for vt2002P */
@@ -3731,30 +3717,28 @@ static void set_widgets_power_state_vt1812(struct hda_codec *codec)
         set_pin_power_state(codec, 0x2b, &parm);
         parm = AC_PWRST_D0;
         /* MUX10/11 (1eh/1fh), AIW 0/1 (10h/11h) */
-        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1e, parm);
+        update_power_state(codec, 0x1f, parm);
+        update_power_state(codec, 0x10, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* outputs */
         /* AOW0 (8h)*/
-        snd_hda_codec_write(codec, 0x8, 0,
-                            AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+        update_power_state(codec, 0x8, AC_PWRST_D0);
 
         /* PW4 (28h), MW4 (18h), MUX4(38h) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x28, &parm);
-        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x38, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x18, parm);
+        update_power_state(codec, 0x38, parm);
 
         /* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x25, &parm);
-        snd_hda_codec_write(codec, 0x15, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x35, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x15, parm);
+        update_power_state(codec, 0x35, parm);
         if (spec->hp_independent_mode)
-                snd_hda_codec_write(codec, 0x9, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x9, AC_PWRST_D0);
 
         /* Internal Speaker */
         /* PW0 (24h), MW0(14h), MUX0(34h) */
@@ -3763,15 +3747,11 @@ static void set_widgets_power_state_vt1812(struct hda_codec *codec)
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x24, &parm);
         if (present) {
-                snd_hda_codec_write(codec, 0x14, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                snd_hda_codec_write(codec, 0x34, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                update_power_state(codec, 0x14, AC_PWRST_D3);
+                update_power_state(codec, 0x34, AC_PWRST_D3);
         } else {
-                snd_hda_codec_write(codec, 0x14, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                snd_hda_codec_write(codec, 0x34, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x14, AC_PWRST_D0);
+                update_power_state(codec, 0x34, AC_PWRST_D0);
         }
 
 
@@ -3782,26 +3762,20 @@ static void set_widgets_power_state_vt1812(struct hda_codec *codec)
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x31, &parm);
         if (present) {
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                snd_hda_codec_write(codec, 0x3c, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                snd_hda_codec_write(codec, 0x3e, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                update_power_state(codec, 0x1c, AC_PWRST_D3);
+                update_power_state(codec, 0x3c, AC_PWRST_D3);
+                update_power_state(codec, 0x3e, AC_PWRST_D3);
         } else {
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                snd_hda_codec_write(codec, 0x3c, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                snd_hda_codec_write(codec, 0x3e, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x1c, AC_PWRST_D0);
+                update_power_state(codec, 0x3c, AC_PWRST_D0);
+                update_power_state(codec, 0x3e, AC_PWRST_D0);
         }
 
         /* PW15 (33h), MW15 (1dh), MUX15(3dh) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x33, &parm);
-        snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x3d, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1d, parm);
+        update_power_state(codec, 0x3d, parm);
 
 }
 
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index 26c7e8bcb229..c0dbb52d45be 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -618,9 +618,12 @@ static int ac97_volume_get(struct snd_kcontrol *ctl,
         mutex_lock(&chip->mutex);
         reg = oxygen_read_ac97(chip, codec, index);
         mutex_unlock(&chip->mutex);
-        value->value.integer.value[0] = 31 - (reg & 0x1f);
-        if (stereo)
-                value->value.integer.value[1] = 31 - ((reg >> 8) & 0x1f);
+        if (!stereo) {
+                value->value.integer.value[0] = 31 - (reg & 0x1f);
+        } else {
+                value->value.integer.value[0] = 31 - ((reg >> 8) & 0x1f);
+                value->value.integer.value[1] = 31 - (reg & 0x1f);
+        }
         return 0;
 }
 
@@ -636,14 +639,14 @@ static int ac97_volume_put(struct snd_kcontrol *ctl,
 
         mutex_lock(&chip->mutex);
         oldreg = oxygen_read_ac97(chip, codec, index);
-        newreg = oldreg;
-        newreg = (newreg & ~0x1f) |
-                (31 - (value->value.integer.value[0] & 0x1f));
-        if (stereo)
-                newreg = (newreg & ~0x1f00) |
-                        ((31 - (value->value.integer.value[1] & 0x1f)) << 8);
-        else
-                newreg = (newreg & ~0x1f00) | ((newreg & 0x1f) << 8);
+        if (!stereo) {
+                newreg = oldreg & ~0x1f;
+                newreg |= 31 - (value->value.integer.value[0] & 0x1f);
+        } else {
+                newreg = oldreg & ~0x1f1f;
+                newreg |= (31 - (value->value.integer.value[0] & 0x1f)) << 8;
+                newreg |= 31 - (value->value.integer.value[1] & 0x1f);
+        }
         change = newreg != oldreg;
         if (change)
                 oxygen_write_ac97(chip, codec, index, newreg);
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 9d38db8f1919..78979b3e0e95 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1113,7 +1113,7 @@ static int cs42l73_pcm_hw_params(struct snd_pcm_substream *substream,
                 priv->config[id].mmcc &= 0xC0;
                 priv->config[id].mmcc |= cs42l73_mclk_coeffs[mclk_coeff].mmcc;
                 priv->config[id].spc &= 0xFC;
-                priv->config[id].spc &= MCK_SCLK_64FS;
+                priv->config[id].spc |= MCK_SCLK_MCLK;
         } else {
                 /* CS42L73 Slave */
                 priv->config[id].spc &= 0xFC;
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 66f0611e68b6..89f2af77b1c3 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1405,6 +1405,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
 
         case SND_SOC_BIAS_OFF:
                 regcache_cache_only(wm5100->regmap, true);
+                regcache_mark_dirty(wm5100->regmap);
                 if (wm5100->pdata.ldo_ena)
                         gpio_set_value_cansleep(wm5100->pdata.ldo_ena, 0);
                 regulator_bulk_disable(ARRAY_SIZE(wm5100->core_supplies),
@@ -2183,6 +2184,7 @@ static void wm5100_micd_irq(struct snd_soc_codec *codec)
                 if (wm5100->jack_detecting) {
                         dev_dbg(codec->dev, "Microphone detected\n");
                         wm5100->jack_mic = true;
+                        wm5100->jack_detecting = false;
                         snd_soc_jack_report(wm5100->jack,
                                             SND_JACK_HEADSET,
                                             SND_JACK_HEADSET | SND_JACK_BTN_0);
@@ -2221,6 +2223,7 @@ static void wm5100_micd_irq(struct snd_soc_codec *codec)
                                             SND_JACK_BTN_0);
                 } else if (wm5100->jack_detecting) {
                         dev_dbg(codec->dev, "Headphone detected\n");
+                        wm5100->jack_detecting = false;
                         snd_soc_jack_report(wm5100->jack, SND_JACK_HEADPHONE,
                                             SND_JACK_HEADPHONE);
 
@@ -2610,6 +2613,13 @@ static const struct regmap_config wm5100_regmap = {
         .cache_type = REGCACHE_RBTREE,
 };
 
+static const unsigned int wm5100_mic_ctrl_reg[] = {
+        WM5100_IN1L_CONTROL,
+        WM5100_IN2L_CONTROL,
+        WM5100_IN3L_CONTROL,
+        WM5100_IN4L_CONTROL,
+};
+
 static __devinit int wm5100_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
@@ -2742,7 +2752,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c,
         }
 
         for (i = 0; i < ARRAY_SIZE(wm5100->pdata.in_mode); i++) {
-                regmap_update_bits(wm5100->regmap, WM5100_IN1L_CONTROL,
+                regmap_update_bits(wm5100->regmap, wm5100_mic_ctrl_reg[i],
                                    WM5100_IN1_MODE_MASK |
                                    WM5100_IN1_DMIC_SUP_MASK,
                                    (wm5100->pdata.in_mode[i] <<
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 296de4e30d26..29c4b02c4790 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -96,7 +96,7 @@ static int wm8962_regulator_event_##n(struct notifier_block *nb, \
         struct wm8962_priv *wm8962 = container_of(nb, struct wm8962_priv, \
                                                   disable_nb[n]); \
         if (event & REGULATOR_EVENT_DISABLE) { \
-                regcache_cache_only(wm8962->regmap, true);      \
+                regcache_mark_dirty(wm8962->regmap);    \
         } \
         return 0; \
 }
@@ -3159,13 +3159,13 @@ static int wm8962_hw_params(struct snd_pcm_substream *substream,
         case SNDRV_PCM_FORMAT_S16_LE:
                 break;
         case SNDRV_PCM_FORMAT_S20_3LE:
-                aif0 |= 0x40;
+                aif0 |= 0x4;
                 break;
         case SNDRV_PCM_FORMAT_S24_LE:
-                aif0 |= 0x80;
+                aif0 |= 0x8;
                 break;
         case SNDRV_PCM_FORMAT_S32_LE:
-                aif0 |= 0xc0;
+                aif0 |= 0xc;
                 break;
         default:
                 return -EINVAL;
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 93d27b660257..ec69a6c152fe 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -770,6 +770,8 @@ static void vmid_reference(struct snd_soc_codec *codec)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
+        pm_runtime_get_sync(codec->dev);
+
         wm8994->vmid_refcount++;
 
         dev_dbg(codec->dev, "Referencing VMID, refcount is now %d\n",
@@ -783,7 +785,12 @@ static void vmid_reference(struct snd_soc_codec *codec)
                                     WM8994_VMID_RAMP_MASK,
                                     WM8994_STARTUP_BIAS_ENA |
                                     WM8994_VMID_BUF_ENA |
-                                    (0x11 << WM8994_VMID_RAMP_SHIFT));
+                                    (0x3 << WM8994_VMID_RAMP_SHIFT));
+
+                /* Remove discharge for line out */
+                snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
+                                    WM8994_LINEOUT1_DISCH |
+                                    WM8994_LINEOUT2_DISCH, 0);
 
                 /* Main bias enable, VMID=2x40k */
                 snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
@@ -837,6 +844,8 @@ static void vmid_dereference(struct snd_soc_codec *codec)
                                     WM8994_VMID_BUF_ENA |
                                     WM8994_VMID_RAMP_MASK, 0);
         }
+
+        pm_runtime_put(codec->dev);
 }
 
 static int vmid_event(struct snd_soc_dapm_widget *w,
@@ -2753,11 +2762,6 @@ static int wm8994_resume(struct snd_soc_codec *codec)
                 codec->cache_only = 0;
         }
 
-        /* Restore the registers */
-        ret = snd_soc_cache_sync(codec);
-        if (ret != 0)
-                dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
-
         wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) {
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 13aa2bdaa7d7..61f7daa4d0e6 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -108,7 +108,7 @@ static int wm8996_regulator_event_##n(struct notifier_block *nb, \
         struct wm8996_priv *wm8996 = container_of(nb, struct wm8996_priv, \
                                                   disable_nb[n]); \
         if (event & REGULATOR_EVENT_DISABLE) { \
-                regcache_cache_only(wm8996->regmap, true);      \
+                regcache_mark_dirty(wm8996->regmap);    \
         } \
         return 0; \
 }
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 2a61094075f8..8a68cea4a3ee 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -586,14 +586,14 @@ SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER1, 0, 1, 0),
 };
 
 static const struct snd_kcontrol_new line2_mix[] = {
-SOC_DAPM_SINGLE("IN2R Switch", WM8993_LINE_MIXER2, 2, 1, 0),
-SOC_DAPM_SINGLE("IN2L Switch", WM8993_LINE_MIXER2, 1, 1, 0),
+SOC_DAPM_SINGLE("IN1L Switch", WM8993_LINE_MIXER2, 2, 1, 0),
+SOC_DAPM_SINGLE("IN1R Switch", WM8993_LINE_MIXER2, 1, 1, 0),
 SOC_DAPM_SINGLE("Output Switch", WM8993_LINE_MIXER2, 0, 1, 0),
 };
 
 static const struct snd_kcontrol_new line2n_mix[] = {
-SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER2, 6, 1, 0),
-SOC_DAPM_SINGLE("Right Output Switch", WM8993_LINE_MIXER2, 5, 1, 0),
+SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER2, 5, 1, 0),
+SOC_DAPM_SINGLE("Right Output Switch", WM8993_LINE_MIXER2, 6, 1, 0),
 };
 
 static const struct snd_kcontrol_new line2p_mix[] = {
@@ -613,6 +613,8 @@ SND_SOC_DAPM_INPUT("IN2RP:VXRP"),
 SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0, NULL, 0),
 
+SND_SOC_DAPM_SUPPLY("LINEOUT_VMID_BUF", WM8993_ANTIPOP1, 7, 0, NULL, 0),
+
 SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0,
                    in1l_pga, ARRAY_SIZE(in1l_pga)),
 SND_SOC_DAPM_MIXER("IN1R PGA", WM8993_POWER_MANAGEMENT_2, 4, 0,
@@ -834,9 +836,11 @@ static const struct snd_soc_dapm_route lineout1_diff_routes[] = {
 };
 
 static const struct snd_soc_dapm_route lineout1_se_routes[] = {
+        { "LINEOUT1N Mixer", NULL, "LINEOUT_VMID_BUF" },
         { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" },
         { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" },
 
+        { "LINEOUT1P Mixer", NULL, "LINEOUT_VMID_BUF" },
         { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" },
 
         { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },
@@ -844,8 +848,8 @@ static const struct snd_soc_dapm_route lineout1_se_routes[] = {
 };
 
 static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
-        { "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" },
-        { "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" },
+        { "LINEOUT2 Mixer", "IN1L Switch", "IN1L PGA" },
+        { "LINEOUT2 Mixer", "IN1R Switch", "IN1R PGA" },
         { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" },
 
         { "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },
@@ -853,9 +857,11 @@ static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
 };
 
 static const struct snd_soc_dapm_route lineout2_se_routes[] = {
+        { "LINEOUT2N Mixer", NULL, "LINEOUT_VMID_BUF" },
         { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },
         { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" },
 
+        { "LINEOUT2P Mixer", NULL, "LINEOUT_VMID_BUF" },
         { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" },
 
         { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" },
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index 7ac0ba2025c3..c6012ff5bd3e 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -230,8 +230,6 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = {
 
 /* GTA02 specific routes and controls */
 
-#ifdef CONFIG_MACH_NEO1973_GTA02
-
 static int gta02_speaker_enabled;
 
 static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
@@ -311,10 +309,6 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
         return 0;
 }
 
-#else
-static int neo1973_gta02_wm8753_init(struct snd_soc_code *codec) { return 0; }
-#endif
-
 static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
@@ -322,10 +316,6 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
         int ret;
 
         /* set up NC codec pins */
-        if (machine_is_neo1973_gta01()) {
-                snd_soc_dapm_nc_pin(dapm, "LOUT2");
-                snd_soc_dapm_nc_pin(dapm, "ROUT2");
-        }
         snd_soc_dapm_nc_pin(dapm, "OUT3");
         snd_soc_dapm_nc_pin(dapm, "OUT4");
         snd_soc_dapm_nc_pin(dapm, "LINE1");
@@ -370,50 +360,6 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
         return 0;
 }
 
-/* GTA01 specific controls */
-
-#ifdef CONFIG_MACH_NEO1973_GTA01
-
-static const struct snd_soc_dapm_route neo1973_lm4857_routes[] = {
-        {"Amp IN", NULL, "ROUT1"},
-        {"Amp IN", NULL, "LOUT1"},
-
-        {"Handset Spk", NULL, "Amp EP"},
-        {"Stereo Out", NULL, "Amp LS"},
-        {"Headphone", NULL, "Amp HP"},
-};
-
-static const struct snd_soc_dapm_widget neo1973_lm4857_dapm_widgets[] = {
-        SND_SOC_DAPM_SPK("Handset Spk", NULL),
-        SND_SOC_DAPM_SPK("Stereo Out", NULL),
-        SND_SOC_DAPM_HP("Headphone", NULL),
-};
-
-static int neo1973_lm4857_init(struct snd_soc_dapm_context *dapm)
-{
-        int ret;
-
-        ret = snd_soc_dapm_new_controls(dapm, neo1973_lm4857_dapm_widgets,
-                        ARRAY_SIZE(neo1973_lm4857_dapm_widgets));
-        if (ret)
-                return ret;
-
-        ret = snd_soc_dapm_add_routes(dapm, neo1973_lm4857_routes,
-                        ARRAY_SIZE(neo1973_lm4857_routes));
-        if (ret)
-                return ret;
-
-        snd_soc_dapm_ignore_suspend(dapm, "Stereo Out");
-        snd_soc_dapm_ignore_suspend(dapm, "Handset Spk");
-        snd_soc_dapm_ignore_suspend(dapm, "Headphone");
-
-        return 0;
-}
-
-#else
-static int neo1973_lm4857_init(struct snd_soc_dapm_context *dapm) { return 0; };
-#endif
-
 static struct snd_soc_dai_link neo1973_dai[] = {
 { /* Hifi Playback - for similatious use with voice below */
         .name = "WM8753",
@@ -440,11 +386,6 @@ static struct snd_soc_aux_dev neo1973_aux_devs[] = {
                 .name = "dfbmcs320",
                 .codec_name = "dfbmcs320.0",
         },
-        {
-                .name = "lm4857",
-                .codec_name = "lm4857.0-007c",
-                .init = neo1973_lm4857_init,
-        },
 };
 
 static struct snd_soc_codec_conf neo1973_codec_conf[] = {
@@ -454,14 +395,10 @@ static struct snd_soc_codec_conf neo1973_codec_conf[] = {
         },
 };
 
-#ifdef CONFIG_MACH_NEO1973_GTA02
 static const struct gpio neo1973_gta02_gpios[] = {
         { GTA02_GPIO_HP_IN, GPIOF_OUT_INIT_HIGH, "GTA02_HP_IN" },
         { GTA02_GPIO_AMP_SHUT, GPIOF_OUT_INIT_HIGH, "GTA02_AMP_SHUT" },
 };
-#else
-static const struct gpio neo1973_gta02_gpios[] = {};
-#endif
 
 static struct snd_soc_card neo1973 = {
         .name = "neo1973",
@@ -480,7 +417,7 @@ static int __init neo1973_init(void)
 {
         int ret;
 
-        if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02())
+        if (!machine_is_neo1973_gta02())
                 return -ENODEV;
 
         if (machine_is_neo1973_gta02()) {
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b5ecf6d23214..92cee24ed2dc 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -567,6 +567,17 @@ int snd_soc_suspend(struct device *dev)
                 if (!codec->suspended && codec->driver->suspend) {
                         switch (codec->dapm.bias_level) {
                         case SND_SOC_BIAS_STANDBY:
+                                /*
+                                 * If the CODEC is capable of idle
+                                 * bias off then being in STANDBY
+                                 * means it's doing something,
+                                 * otherwise fall through.
+                                 */
+                                if (codec->dapm.idle_bias_off) {
+                                        dev_dbg(codec->dev,
+                                                "idle_bias_off CODEC on over suspend\n");
+                                        break;
+                                }
                         case SND_SOC_BIAS_OFF:
                                 codec->driver->suspend(codec);
                                 codec->suspended = 1;
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 8edc5035fc8f..d89ab4c7d44b 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -1618,6 +1618,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 {
+        /* Edirol UM-3G */
+        USB_DEVICE_VENDOR_SPEC(0x0582, 0x0108),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .ifnum = 0,
+                .type = QUIRK_MIDI_STANDARD_INTERFACE
+        }
+},
+{
         /* Boss JS-8 Jam Station  */
         USB_DEVICE(0x0582, 0x0109),
         .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index ac86d67b636e..7c12650165ae 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -104,7 +104,7 @@ endif
 
 CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
 EXTLIBS = -lpthread -lrt -lelf -lm
-ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
 
@@ -168,10 +168,7 @@ endif
 
 ### --- END CONFIGURATION SECTION ---
 
-# Those must not be GNU-specific; they are shared with perl/ which may
-# be built by a different compiler. (Note that this is an artifact now
-# but it still might be nice to keep that distinction.)
-BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include
+BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 BASIC_LDFLAGS =
 
 # Guard against environment variables
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 59d43abfbfec..fb8566181f27 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#define _GNU_SOURCE
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -31,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef _GNU_SOURCE
 #include "perf.h"
 #include "builtin.h"
 #include "util/util.h"
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 8f80df896038..dd162aa24baa 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -89,8 +89,6 @@ void get_term_dimensions(struct winsize *ws)
 
 static void perf_top__update_print_entries(struct perf_top *top)
 {
-        top->print_entries = top->winsize.ws_row;
-
         if (top->print_entries > 9)
                 top->print_entries -= 9;
 }
@@ -100,6 +98,13 @@ static void perf_top__sig_winch(int sig __used, siginfo_t *info __used, void *ar
         struct perf_top *top = arg;
 
         get_term_dimensions(&top->winsize);
+        if (!top->print_entries
+            || (top->print_entries+4) > top->winsize.ws_row) {
+                top->print_entries = top->winsize.ws_row;
+        } else {
+                top->print_entries += 4;
+                top->winsize.ws_row = top->print_entries;
+        }
         perf_top__update_print_entries(top);
 }
 
@@ -453,8 +458,10 @@ static void perf_top__handle_keypress(struct perf_top *top, int c)
                                 };
                                 perf_top__sig_winch(SIGWINCH, NULL, top);
                                 sigaction(SIGWINCH, &act, NULL);
-                        } else
+                        } else {
+                                perf_top__sig_winch(SIGWINCH, NULL, top);
                                 signal(SIGWINCH, SIG_DFL);
+                        }
                         break;
                 case 'E':
                         if (top->evlist->nr_entries > 1) {
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 3e7e0b09c12c..ecd7f4dd7eea 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2105,7 +2105,7 @@ int perf_event__synthesize_event_type(struct perf_tool *tool,
         strncpy(ev.event_type.event_type.name, name, MAX_EVENT_NAME - 1);
 
         ev.event_type.header.type = PERF_RECORD_HEADER_EVENT_TYPE;
-        size = strlen(name);
+        size = strlen(ev.event_type.event_type.name);
         size = ALIGN(size, sizeof(u64));
         ev.event_type.header.size = sizeof(ev.event_type) -
                 (sizeof(ev.event_type.event_type.name) - size);
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index eb25900e2211..29cb65459811 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -19,7 +19,6 @@
  *
  */
 
-#define _GNU_SOURCE
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -33,7 +32,6 @@
 #include <limits.h>
 #include <elf.h>
 
-#undef _GNU_SOURCE
 #include "util.h"
 #include "event.h"
 #include "string.h"
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 215d50f2042e..0975438c3e72 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 6c164dc9ee95..1a8d4dc4f386 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -21,14 +21,13 @@
  *  The parts for function graph printing was taken and modified from the
  *  Linux Kernel that were written by Frederic Weisbecker.
  */
-#define _GNU_SOURCE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
-#undef _GNU_SOURCE
 #include "../perf.h"
 #include "util.h"
 #include "trace-event.h"
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index 1212a386a033..e81aef1f2569 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -1,6 +1,4 @@
-#define _GNU_SOURCE
 #include <stdio.h>
-#undef _GNU_SOURCE
 #include "../libslang.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/perf/util/ui/helpline.c b/tools/perf/util/ui/helpline.c
index 6ef3c5691762..4f48f5901b30 100644
--- a/tools/perf/util/ui/helpline.c
+++ b/tools/perf/util/ui/helpline.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index b9c530cce79a..ecf9898169c8 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -40,7 +40,6 @@
 #define decimal_length(x)       ((int)(sizeof(x) * 2.56 + 0.5) + 1)
 
 #define _ALL_SOURCE 1
-#define _GNU_SOURCE 1
 #define _BSD_SOURCE 1
 #define HAS_BOOL
 
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7287bf5d1c9e..a91f980077d8 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1543,7 +1543,7 @@ void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot,
         if (memslot && memslot->dirty_bitmap) {
                 unsigned long rel_gfn = gfn - memslot->base_gfn;
 
-                if (!__test_and_set_bit_le(rel_gfn, memslot->dirty_bitmap))
+                if (!test_and_set_bit_le(rel_gfn, memslot->dirty_bitmap))
                         memslot->nr_dirty_pages++;
         }
 }