Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

82 files changed, 552 insertions, 558 deletions

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 7049a7d27c4f..330bb4d75852 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -631,7 +631,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state)
          * We know a device's inferred power state when all the resources
          * required for a given D-state are 'on'.
          */
-        for (i = ACPI_STATE_D0; i < ACPI_STATE_D3; i++) {
+        for (i = ACPI_STATE_D0; i < ACPI_STATE_D3_HOT; i++) {
                 list = &device->power.states[i].resources;
                 if (list->count < 1)
                         continue;
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 767e2dcb9616..7417267e88fa 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -869,7 +869,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         /*
          * Enumerate supported power management states
          */
-        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3; i++) {
+        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3_HOT; i++) {
                 struct acpi_device_power_state *ps = &device->power.states[i];
                 char object_name[5] = { '_', 'P', 'R', '0' + i, '\0' };
 
@@ -884,21 +884,18 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
                                 acpi_bus_add_power_resource(ps->resources.handles[j]);
                 }
 
-                /* The exist of _PR3 indicates D3Cold support */
-                if (i == ACPI_STATE_D3) {
-                        status = acpi_get_handle(device->handle, object_name, &handle);
-                        if (ACPI_SUCCESS(status))
-                                device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1;
-                }
-
                 /* Evaluate "_PSx" to see if we can do explicit sets */
                 object_name[2] = 'S';
                 status = acpi_get_handle(device->handle, object_name, &handle);
                 if (ACPI_SUCCESS(status))
                         ps->flags.explicit_set = 1;
 
-                /* State is valid if we have some power control */
-                if (ps->resources.count || ps->flags.explicit_set)
+                /*
+                 * State is valid if there are means to put the device into it.
+                 * D3hot is only valid if _PR3 present.
+                 */
+                if (ps->resources.count ||
+                    (ps->flags.explicit_set && i < ACPI_STATE_D3_HOT))
                         ps->flags.valid = 1;
 
                 ps->power = -1; /* Unknown - driver assigned */
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7a3f535e481c..bb80853ff27a 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -775,9 +775,11 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
                         map->format.parse_val(val + i);
         } else {
                 for (i = 0; i < val_count; i++) {
-                        ret = regmap_read(map, reg + i, val + (i * val_bytes));
+                        unsigned int ival;
+                        ret = regmap_read(map, reg + i, &ival);
                         if (ret != 0)
                                 return ret;
+                        memcpy(val + (i * val_bytes), &ival, val_bytes);
                 }
         }
 
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index abfaacaaf346..946166e13953 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2297,7 +2297,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
                 return;
         }
 
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN)) {
+        if (!capable(CAP_SYS_ADMIN)) {
                 retcode = ERR_PERM;
                 goto fail;
         }
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 1adc2ec1e383..4461540653a8 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -965,18 +965,15 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
         }
 
         _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->irqenable_inv);
-        _gpio_rmw(base, bank->regs->irqstatus, l,
-                                        bank->regs->irqenable_inv == false);
-        _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->debounce_en != 0);
-        _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->ctrl != 0);
+        _gpio_rmw(base, bank->regs->irqstatus, l, !bank->regs->irqenable_inv);
         if (bank->regs->debounce_en)
-                _gpio_rmw(base, bank->regs->debounce_en, 0, 1);
+                __raw_writel(0, base + bank->regs->debounce_en);
 
         /* Save OE default value (0xffffffff) in the context */
         bank->context.oe = __raw_readl(bank->base + bank->regs->direction);
          /* Initialize interface clk ungated, module enabled */
         if (bank->regs->ctrl)
-                _gpio_rmw(base, bank->regs->ctrl, 0, 1);
+                __raw_writel(0, base + bank->regs->ctrl);
 }
 
 static __devinit void
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index e8729cc2ba2b..2cd958e0b822 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -230,16 +230,12 @@ static void pch_gpio_setup(struct pch_gpio *chip)
 
 static int pch_irq_type(struct irq_data *d, unsigned int type)
 {
-        u32 im;
-        u32 __iomem *im_reg;
-        u32 ien;
-        u32 im_pos;
-        int ch;
-        unsigned long flags;
-        u32 val;
-        int irq = d->irq;
         struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
         struct pch_gpio *chip = gc->private;
+        u32 im, im_pos, val;
+        u32 __iomem *im_reg;
+        unsigned long flags;
+        int ch, irq = d->irq;
 
         ch = irq - chip->irq_base;
         if (irq <= chip->irq_base + 7) {
@@ -270,30 +266,22 @@ static int pch_irq_type(struct irq_data *d, unsigned int type)
         case IRQ_TYPE_LEVEL_LOW:
                 val = PCH_LEVEL_L;
                 break;
-        case IRQ_TYPE_PROBE:
-                goto end;
         default:
-                dev_warn(chip->dev, "%s: unknown type(%dd)",
-                        __func__, type);
-                goto end;
+                goto unlock;
         }
 
         /* Set interrupt mode */
         im = ioread32(im_reg) & ~(PCH_IM_MASK << (im_pos * 4));
         iowrite32(im | (val << (im_pos * 4)), im_reg);
 
-        /* iclr */
-        iowrite32(BIT(ch), &chip->reg->iclr);
+        /* And the handler */
+        if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
+                __irq_set_handler_locked(d->irq, handle_level_irq);
+        else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
+                __irq_set_handler_locked(d->irq, handle_edge_irq);
 
-        /* IMASKCLR */
-        iowrite32(BIT(ch), &chip->reg->imaskclr);
-
-        /* Enable interrupt */
-        ien = ioread32(&chip->reg->ien);
-        iowrite32(ien | BIT(ch), &chip->reg->ien);
-end:
+unlock:
         spin_unlock_irqrestore(&chip->spinlock, flags);
-
         return 0;
 }
 
@@ -313,18 +301,24 @@ static void pch_irq_mask(struct irq_data *d)
         iowrite32(1 << (d->irq - chip->irq_base), &chip->reg->imask);
 }
 
+static void pch_irq_ack(struct irq_data *d)
+{
+        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        struct pch_gpio *chip = gc->private;
+
+        iowrite32(1 << (d->irq - chip->irq_base), &chip->reg->iclr);
+}
+
 static irqreturn_t pch_gpio_handler(int irq, void *dev_id)
 {
         struct pch_gpio *chip = dev_id;
         u32 reg_val = ioread32(&chip->reg->istatus);
-        int i;
-        int ret = IRQ_NONE;
+        int i, ret = IRQ_NONE;
 
         for (i = 0; i < gpio_pins[chip->ioh]; i++) {
                 if (reg_val & BIT(i)) {
                         dev_dbg(chip->dev, "%s:[%d]:irq=%d  status=0x%x\n",
                                 __func__, i, irq, reg_val);
-                        iowrite32(BIT(i), &chip->reg->iclr);
                         generic_handle_irq(chip->irq_base + i);
                         ret = IRQ_HANDLED;
                 }
@@ -343,6 +337,7 @@ static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
         gc->private = chip;
         ct = gc->chip_types;
 
+        ct->chip.irq_ack = pch_irq_ack;
         ct->chip.irq_mask = pch_irq_mask;
         ct->chip.irq_unmask = pch_irq_unmask;
         ct->chip.irq_set_type = pch_irq_type;
@@ -357,6 +352,7 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
         s32 ret;
         struct pch_gpio *chip;
         int irq_base;
+        u32 msk;
 
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
@@ -408,8 +404,13 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
         }
         chip->irq_base = irq_base;
 
+        /* Mask all interrupts, but enable them */
+        msk = (1 << gpio_pins[chip->ioh]) - 1;
+        iowrite32(msk, &chip->reg->imask);
+        iowrite32(msk, &chip->reg->ien);
+
         ret = request_irq(pdev->irq, pch_gpio_handler,
-                             IRQF_SHARED, KBUILD_MODNAME, chip);
+                          IRQF_SHARED, KBUILD_MODNAME, chip);
         if (ret != 0) {
                 dev_err(&pdev->dev,
                         "%s request_irq failed\n", __func__);
@@ -418,8 +419,6 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
 
         pch_gpio_alloc_generic_chip(chip, irq_base, gpio_pins[chip->ioh]);
 
-        /* Initialize interrupt ien register */
-        iowrite32(0, &chip->reg->ien);
 end:
         return 0;
 
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index 19d6fc0229c3..e991d9171961 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -452,12 +452,14 @@ static struct samsung_gpio_cfg s3c24xx_gpiocfg_banka = {
 };
 #endif
 
+#if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_ARCH_EXYNOS5)
 static struct samsung_gpio_cfg exynos_gpio_cfg = {
         .set_pull       = exynos_gpio_setpull,
         .get_pull       = exynos_gpio_getpull,
         .set_config     = samsung_gpio_setcfg_4bit,
         .get_config     = samsung_gpio_getcfg_4bit,
 };
+#endif
 
 #if defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450)
 static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = {
@@ -2123,8 +2125,8 @@ static struct samsung_gpio_chip s5pv210_gpios_4bit[] = {
  * uses the above macro and depends on the banks being listed in order here.
  */
 
-static struct samsung_gpio_chip exynos4_gpios_1[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_1[] = {
         {
                 .chip   = {
                         .base   = EXYNOS4_GPA0(0),
@@ -2222,11 +2224,11 @@ static struct samsung_gpio_chip exynos4_gpios_1[] = {
                         .label  = "GPF3",
                 },
         },
-#endif
 };
+#endif
 
-static struct samsung_gpio_chip exynos4_gpios_2[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_2[] = {
         {
                 .chip   = {
                         .base   = EXYNOS4_GPJ0(0),
@@ -2367,11 +2369,11 @@ static struct samsung_gpio_chip exynos4_gpios_2[] = {
                         .to_irq = samsung_gpiolib_to_irq,
                 },
         },
-#endif
 };
+#endif
 
-static struct samsung_gpio_chip exynos4_gpios_3[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_3[] = {
         {
                 .chip   = {
                         .base   = EXYNOS4_GPZ(0),
@@ -2379,8 +2381,8 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
                         .label  = "GPZ",
                 },
         },
-#endif
 };
+#endif
 
 #ifdef CONFIG_ARCH_EXYNOS5
 static struct samsung_gpio_chip exynos5_gpios_1[] = {
@@ -2719,7 +2721,9 @@ static __init int samsung_gpiolib_init(void)
 {
         struct samsung_gpio_chip *chip;
         int i, nr_chips;
+#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS5250)
         void __iomem *gpio_base1, *gpio_base2, *gpio_base3, *gpio_base4;
+#endif
         int group = 0;
 
         samsung_gpiolib_set_cfg(samsung_gpio_cfgs, ARRAY_SIZE(samsung_gpio_cfgs));
@@ -2971,6 +2975,7 @@ static __init int samsung_gpiolib_init(void)
 
         return 0;
 
+#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS5250)
 err_ioremap4:
         iounmap(gpio_base3);
 err_ioremap3:
@@ -2979,6 +2984,7 @@ err_ioremap2:
         iounmap(gpio_base1);
 err_ioremap1:
         return -ENOMEM;
+#endif
 }
 core_initcall(samsung_gpiolib_init);
 
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index b505b70dba05..e6162a1681f0 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1224,6 +1224,9 @@ static int i915_emon_status(struct seq_file *m, void *unused)
         unsigned long temp, chipset, gfx;
         int ret;
 
+        if (!IS_GEN5(dev))
+                return -ENODEV;
+
         ret = mutex_lock_interruptible(&dev->struct_mutex);
         if (ret)
                 return ret;
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 785f67f963ef..ba60f3c8f911 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1701,6 +1701,9 @@ void i915_update_gfx_val(struct drm_i915_private *dev_priv)
         unsigned long diffms;
         u32 count;
 
+        if (dev_priv->info->gen != 5)
+                return;
+
         getrawmonotonic(&now);
         diff1 = timespec_sub(now, dev_priv->last_time2);
 
@@ -2121,12 +2124,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         setup_timer(&dev_priv->hangcheck_timer, i915_hangcheck_elapsed,
                     (unsigned long) dev);
 
-        spin_lock(&mchdev_lock);
-        i915_mch_dev = dev_priv;
-        dev_priv->mchdev_lock = &mchdev_lock;
-        spin_unlock(&mchdev_lock);
+        if (IS_GEN5(dev)) {
+                spin_lock(&mchdev_lock);
+                i915_mch_dev = dev_priv;
+                dev_priv->mchdev_lock = &mchdev_lock;
+                spin_unlock(&mchdev_lock);
 
-        ips_ping_for_i915_load();
+                ips_ping_for_i915_load();
+        }
 
         return 0;
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5908cd563400..1b1cf3b3ff51 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7072,9 +7072,6 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
         struct drm_device *dev = crtc->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        int pipe = intel_crtc->pipe;
-        int dpll_reg = DPLL(pipe);
-        int dpll = I915_READ(dpll_reg);
 
         if (HAS_PCH_SPLIT(dev))
                 return;
@@ -7087,10 +7084,15 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
          * the manual case.
          */
         if (!HAS_PIPE_CXSR(dev) && intel_crtc->lowfreq_avail) {
+                int pipe = intel_crtc->pipe;
+                int dpll_reg = DPLL(pipe);
+                u32 dpll;
+
                 DRM_DEBUG_DRIVER("downclocking LVDS\n");
 
                 assert_panel_unlocked(dev_priv, pipe);
 
+                dpll = I915_READ(dpll_reg);
                 dpll |= DISPLAY_RATE_SELECT_FPA1;
                 I915_WRITE(dpll_reg, dpll);
                 intel_wait_for_vblank(dev, pipe);
@@ -7098,7 +7100,6 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
                 if (!(dpll & DISPLAY_RATE_SELECT_FPA1))
                         DRM_DEBUG_DRIVER("failed to downclock LVDS!\n");
         }
-
 }
 
 /**
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index cae3e5f17a49..2d7f47b56b6a 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -136,7 +136,7 @@ static void i9xx_write_infoframe(struct drm_encoder *encoder,
 
         val &= ~VIDEO_DIP_SELECT_MASK;
 
-        I915_WRITE(VIDEO_DIP_CTL, val | port | flags);
+        I915_WRITE(VIDEO_DIP_CTL, VIDEO_DIP_ENABLE | val | port | flags);
 
         for (i = 0; i < len; i += 4) {
                 I915_WRITE(VIDEO_DIP_DATA, *data);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 30e2c82101de..9c71183629c2 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -750,7 +750,7 @@ static const struct dmi_system_id intel_no_lvds[] = {
                 .ident = "Hewlett-Packard t5745",
                 .matches = {
                         DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-                        DMI_MATCH(DMI_BOARD_NAME, "hp t5745"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "hp t5745"),
                 },
         },
         {
@@ -758,7 +758,7 @@ static const struct dmi_system_id intel_no_lvds[] = {
                 .ident = "Hewlett-Packard st5747",
                 .matches = {
                         DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-                        DMI_MATCH(DMI_BOARD_NAME, "hp st5747"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "hp st5747"),
                 },
         },
         {
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 80fce51e2f43..62892a826ede 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -398,10 +398,8 @@ static int init_render_ring(struct intel_ring_buffer *ring)
                         return ret;
         }
 
-        if (INTEL_INFO(dev)->gen >= 6) {
-                I915_WRITE(INSTPM,
-                           INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);
 
+        if (IS_GEN6(dev)) {
                 /* From the Sandybridge PRM, volume 1 part 3, page 24:
                  * "If this bit is set, STCunit will have LRA as replacement
                  *  policy. [...] This bit must be reset.  LRA replacement
@@ -411,6 +409,11 @@ static int init_render_ring(struct intel_ring_buffer *ring)
                            CM0_STC_EVICT_DISABLE_LRA_SNB << CM0_MASK_SHIFT);
         }
 
+        if (INTEL_INFO(dev)->gen >= 6) {
+                I915_WRITE(INSTPM,
+                           INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);
+        }
+
         return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 232d77d07d8b..ae5e748f39bb 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1220,8 +1220,14 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct in
 
 static int intel_sdvo_supports_hotplug(struct intel_sdvo *intel_sdvo)
 {
+        struct drm_device *dev = intel_sdvo->base.base.dev;
         u8 response[2];
 
+        /* HW Erratum: SDVO Hotplug is broken on all i945G chips, there's noise
+         * on the line. */
+        if (IS_I945G(dev) || IS_I945GM(dev))
+                return false;
+
         return intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT,
                                     &response, 2) && response[0];
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index e2be95af2e52..77e564667b5c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -29,10 +29,6 @@
 #include "nouveau_i2c.h"
 #include "nouveau_hw.h"
 
-#define T_TIMEOUT  2200000
-#define T_RISEFALL 1000
-#define T_HOLD     5000
-
 static void
 i2c_drive_scl(void *data, int state)
 {
@@ -113,175 +109,6 @@ i2c_sense_sda(void *data)
         return 0;
 }
 
-static void
-i2c_delay(struct nouveau_i2c_chan *port, u32 nsec)
-{
-        udelay((nsec + 500) / 1000);
-}
-
-static bool
-i2c_raise_scl(struct nouveau_i2c_chan *port)
-{
-        u32 timeout = T_TIMEOUT / T_RISEFALL;
-
-        i2c_drive_scl(port, 1);
-        do {
-                i2c_delay(port, T_RISEFALL);
-        } while (!i2c_sense_scl(port) && --timeout);
-
-        return timeout != 0;
-}
-
-static int
-i2c_start(struct nouveau_i2c_chan *port)
-{
-        int ret = 0;
-
-        port->state  = i2c_sense_scl(port);
-        port->state |= i2c_sense_sda(port) << 1;
-        if (port->state != 3) {
-                i2c_drive_scl(port, 0);
-                i2c_drive_sda(port, 1);
-                if (!i2c_raise_scl(port))
-                        ret = -EBUSY;
-        }
-
-        i2c_drive_sda(port, 0);
-        i2c_delay(port, T_HOLD);
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return ret;
-}
-
-static void
-i2c_stop(struct nouveau_i2c_chan *port)
-{
-        i2c_drive_scl(port, 0);
-        i2c_drive_sda(port, 0);
-        i2c_delay(port, T_RISEFALL);
-
-        i2c_drive_scl(port, 1);
-        i2c_delay(port, T_HOLD);
-        i2c_drive_sda(port, 1);
-        i2c_delay(port, T_HOLD);
-}
-
-static int
-i2c_bitw(struct nouveau_i2c_chan *port, int sda)
-{
-        i2c_drive_sda(port, sda);
-        i2c_delay(port, T_RISEFALL);
-
-        if (!i2c_raise_scl(port))
-                return -ETIMEDOUT;
-        i2c_delay(port, T_HOLD);
-
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return 0;
-}
-
-static int
-i2c_bitr(struct nouveau_i2c_chan *port)
-{
-        int sda;
-
-        i2c_drive_sda(port, 1);
-        i2c_delay(port, T_RISEFALL);
-
-        if (!i2c_raise_scl(port))
-                return -ETIMEDOUT;
-        i2c_delay(port, T_HOLD);
-
-        sda = i2c_sense_sda(port);
-
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return sda;
-}
-
-static int
-i2c_get_byte(struct nouveau_i2c_chan *port, u8 *byte, bool last)
-{
-        int i, bit;
-
-        *byte = 0;
-        for (i = 7; i >= 0; i--) {
-                bit = i2c_bitr(port);
-                if (bit < 0)
-                        return bit;
-                *byte |= bit << i;
-        }
-
-        return i2c_bitw(port, last ? 1 : 0);
-}
-
-static int
-i2c_put_byte(struct nouveau_i2c_chan *port, u8 byte)
-{
-        int i, ret;
-        for (i = 7; i >= 0; i--) {
-                ret = i2c_bitw(port, !!(byte & (1 << i)));
-                if (ret < 0)
-                        return ret;
-        }
-
-        ret = i2c_bitr(port);
-        if (ret == 1) /* nack */
-                ret = -EIO;
-        return ret;
-}
-
-static int
-i2c_addr(struct nouveau_i2c_chan *port, struct i2c_msg *msg)
-{
-        u32 addr = msg->addr << 1;
-        if (msg->flags & I2C_M_RD)
-                addr |= 1;
-        return i2c_put_byte(port, addr);
-}
-
-static int
-i2c_bit_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
-{
-        struct nouveau_i2c_chan *port = (struct nouveau_i2c_chan *)adap;
-        struct i2c_msg *msg = msgs;
-        int ret = 0, mcnt = num;
-
-        while (!ret && mcnt--) {
-                u8 remaining = msg->len;
-                u8 *ptr = msg->buf;
-
-                ret = i2c_start(port);
-                if (ret == 0)
-                        ret = i2c_addr(port, msg);
-
-                if (msg->flags & I2C_M_RD) {
-                        while (!ret && remaining--)
-                                ret = i2c_get_byte(port, ptr++, !remaining);
-                } else {
-                        while (!ret && remaining--)
-                                ret = i2c_put_byte(port, *ptr++);
-                }
-
-                msg++;
-        }
-
-        i2c_stop(port);
-        return (ret < 0) ? ret : num;
-}
-
-static u32
-i2c_bit_func(struct i2c_adapter *adap)
-{
-        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
-}
-
-const struct i2c_algorithm nouveau_i2c_bit_algo = {
-        .master_xfer = i2c_bit_xfer,
-        .functionality = i2c_bit_func
-};
-
 static const uint32_t nv50_i2c_port[] = {
         0x00e138, 0x00e150, 0x00e168, 0x00e180,
         0x00e254, 0x00e274, 0x00e764, 0x00e780,
@@ -384,12 +211,10 @@ nouveau_i2c_init(struct drm_device *dev)
                 case 0: /* NV04:NV50 */
                         port->drive = entry[0];
                         port->sense = entry[1];
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                         break;
                 case 4: /* NV4E */
                         port->drive = 0x600800 + entry[1];
                         port->sense = port->drive;
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                         break;
                 case 5: /* NV50- */
                         port->drive = entry[0] & 0x0f;
@@ -402,7 +227,6 @@ nouveau_i2c_init(struct drm_device *dev)
                                 port->drive = 0x00d014 + (port->drive * 0x20);
                                 port->sense = port->drive;
                         }
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                         break;
                 case 6: /* NV50- DP AUX */
                         port->drive = entry[0];
@@ -413,7 +237,7 @@ nouveau_i2c_init(struct drm_device *dev)
                         break;
                 }
 
-                if (!port->adapter.algo) {
+                if (!port->adapter.algo && !port->drive) {
                         NV_ERROR(dev, "I2C%d: type %d index %x/%x unknown\n",
                                  i, port->type, port->drive, port->sense);
                         kfree(port);
@@ -429,7 +253,26 @@ nouveau_i2c_init(struct drm_device *dev)
                 port->dcb = ROM32(entry[0]);
                 i2c_set_adapdata(&port->adapter, i2c);
 
-                ret = i2c_add_adapter(&port->adapter);
+                if (port->adapter.algo != &nouveau_dp_i2c_algo) {
+                        port->adapter.algo_data = &port->bit;
+                        port->bit.udelay = 10;
+                        port->bit.timeout = usecs_to_jiffies(2200);
+                        port->bit.data = port;
+                        port->bit.setsda = i2c_drive_sda;
+                        port->bit.setscl = i2c_drive_scl;
+                        port->bit.getsda = i2c_sense_sda;
+                        port->bit.getscl = i2c_sense_scl;
+
+                        i2c_drive_scl(port, 0);
+                        i2c_drive_sda(port, 1);
+                        i2c_drive_scl(port, 1);
+
+                        ret = i2c_bit_add_bus(&port->adapter);
+                } else {
+                        port->adapter.algo = &nouveau_dp_i2c_algo;
+                        ret = i2c_add_adapter(&port->adapter);
+                }
+
                 if (ret) {
                         NV_ERROR(dev, "I2C%d: failed register: %d\n", i, ret);
                         kfree(port);
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h
index 4d2e4e9031be..1d083893a4d7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.h
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h
@@ -34,6 +34,7 @@
 struct nouveau_i2c_chan {
         struct i2c_adapter adapter;
         struct drm_device *dev;
+        struct i2c_algo_bit_data bit;
         struct list_head head;
         u8  index;
         u8  type;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index ea7df16e2f84..5992502a3448 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -241,8 +241,8 @@ int radeon_wb_init(struct radeon_device *rdev)
                                 rdev->wb.use_event = true;
                 }
         }
-        /* always use writeback/events on NI */
-        if (ASIC_IS_DCE5(rdev)) {
+        /* always use writeback/events on NI, APUs */
+        if (rdev->family >= CHIP_PALM) {
                 rdev->wb.enabled = true;
                 rdev->wb.use_event = true;
         }
diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index d8433f2d53bc..73973fdbd8be 100644
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -112,7 +112,7 @@ err_free_addr:
         return err;
 }
 
-static void __devexit gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)
+static void gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)
 {
         int i;
 
@@ -294,7 +294,7 @@ static ssize_t netxbig_led_sata_show(struct device *dev,
 
 static DEVICE_ATTR(sata, 0644, netxbig_led_sata_show, netxbig_led_sata_store);
 
-static void __devexit delete_netxbig_led(struct netxbig_led_data *led_dat)
+static void delete_netxbig_led(struct netxbig_led_data *led_dat)
 {
         if (led_dat->mode_val[NETXBIG_LED_SATA] != NETXBIG_LED_INVALID_MODE)
                 device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index 2f0a14421a73..01cf89ec6944 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -255,7 +255,7 @@ err_free_cmd:
         return ret;
 }
 
-static void __devexit delete_ns2_led(struct ns2_led_data *led_dat)
+static void delete_ns2_led(struct ns2_led_data *led_dat)
 {
         device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
         led_classdev_unregister(&led_dat->cdev);
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 97e73e555d11..17e2b472e16d 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1727,8 +1727,7 @@ int bitmap_create(struct mddev *mddev)
         bitmap->chunkshift = (ffz(~mddev->bitmap_info.chunksize)
                               - BITMAP_BLOCK_SHIFT);
 
-        /* now that chunksize and chunkshift are set, we can use these macros */
-        chunks = (blocks + bitmap->chunkshift - 1) >>
+        chunks = (blocks + (1 << bitmap->chunkshift) - 1) >>
                         bitmap->chunkshift;
         pages = (chunks + PAGE_COUNTER_RATIO - 1) / PAGE_COUNTER_RATIO;
 
diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index 55ca5aec84e4..b44b0aba2d47 100644
--- a/drivers/md/bitmap.h
+++ b/drivers/md/bitmap.h
@@ -101,9 +101,6 @@ typedef __u16 bitmap_counter_t;
 
 #define BITMAP_BLOCK_SHIFT 9
 
-/* how many blocks per chunk? (this is variable) */
-#define CHUNK_BLOCK_RATIO(bitmap) ((bitmap)->mddev->bitmap_info.chunksize >> BITMAP_BLOCK_SHIFT)
-
 #endif
 
 /*
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
index 1f23e048f077..08d9a207259a 100644
--- a/drivers/md/dm-log-userspace-transfer.c
+++ b/drivers/md/dm-log-userspace-transfer.c
@@ -134,7 +134,7 @@ static void cn_ulog_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
 {
         struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1);
 
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_ADMIN))
                 return;
 
         spin_lock(&receiving_list_lock);
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 922a3385eead..754f38f8a692 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -718,8 +718,8 @@ static int parse_hw_handler(struct dm_arg_set *as, struct multipath *m)
                 return 0;
 
         m->hw_handler_name = kstrdup(dm_shift_arg(as), GFP_KERNEL);
-        request_module("scsi_dh_%s", m->hw_handler_name);
-        if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {
+        if (!try_then_request_module(scsi_dh_handler_exist(m->hw_handler_name),
+                                     "scsi_dh_%s", m->hw_handler_name)) {
                 ti->error = "unknown hardware handler type";
                 ret = -EINVAL;
                 goto fail;
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 213ae32a0fc4..2fd87b544a93 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -279,8 +279,10 @@ static void __cell_release(struct cell *cell, struct bio_list *inmates)
 
         hlist_del(&cell->list);
 
-        bio_list_add(inmates, cell->holder);
-        bio_list_merge(inmates, &cell->bios);
+        if (inmates) {
+                bio_list_add(inmates, cell->holder);
+                bio_list_merge(inmates, &cell->bios);
+        }
 
         mempool_free(cell, prison->cell_pool);
 }
@@ -303,9 +305,10 @@ static void cell_release(struct cell *cell, struct bio_list *bios)
  */
 static void __cell_release_singleton(struct cell *cell, struct bio *bio)
 {
-        hlist_del(&cell->list);
         BUG_ON(cell->holder != bio);
         BUG_ON(!bio_list_empty(&cell->bios));
+
+        __cell_release(cell, NULL);
 }
 
 static void cell_release_singleton(struct cell *cell, struct bio *bio)
@@ -1177,6 +1180,7 @@ static void no_space(struct cell *cell)
 static void process_discard(struct thin_c *tc, struct bio *bio)
 {
         int r;
+        unsigned long flags;
         struct pool *pool = tc->pool;
         struct cell *cell, *cell2;
         struct cell_key key, key2;
@@ -1218,7 +1222,9 @@ static void process_discard(struct thin_c *tc, struct bio *bio)
                         m->bio = bio;
 
                         if (!ds_add_work(&pool->all_io_ds, &m->list)) {
+                                spin_lock_irqsave(&pool->lock, flags);
                                 list_add(&m->list, &pool->prepared_discards);
+                                spin_unlock_irqrestore(&pool->lock, flags);
                                 wake_worker(pool);
                         }
                 } else {
@@ -2626,8 +2632,10 @@ static int thin_endio(struct dm_target *ti,
         if (h->all_io_entry) {
                 INIT_LIST_HEAD(&work);
                 ds_dec(h->all_io_entry, &work);
+                spin_lock_irqsave(&pool->lock, flags);
                 list_for_each_entry_safe(m, tmp, &work, list)
                         list_add(&m->list, &pool->prepared_discards);
+                spin_unlock_irqrestore(&pool->lock, flags);
         }
 
         mempool_free(h, pool->endio_hook_pool);
@@ -2759,6 +2767,6 @@ static void dm_thin_exit(void)
 module_init(dm_thin_init);
 module_exit(dm_thin_exit);
 
-MODULE_DESCRIPTION(DM_NAME "device-mapper thin provisioning target");
+MODULE_DESCRIPTION(DM_NAME " thin provisioning target");
 MODULE_AUTHOR("Joe Thornber <dm-devel@redhat.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 0f64d7182657..cb888d835a89 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1921,6 +1921,10 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
         } else {
                 /* default values */
                 switch (c->delivery_system) {
+                case SYS_DVBS:
+                case SYS_DVBS2:
+                case SYS_ISDBS:
+                case SYS_TURBO:
                 case SYS_DVBC_ANNEX_A:
                 case SYS_DVBC_ANNEX_C:
                         fepriv->min_delay = HZ / 20;
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index 860c112e0fd2..bef5296173c9 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -1018,22 +1018,6 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
 
         spin_lock_init(&dev->hw_lock);
 
-        /* claim the resources */
-        error = -EBUSY;
-        dev->hw_io = pnp_port_start(pnp_dev, 0);
-        if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {
-                dev->hw_io = -1;
-                dev->irq = -1;
-                goto error;
-        }
-
-        dev->irq = pnp_irq(pnp_dev, 0);
-        if (request_irq(dev->irq, ene_isr,
-                        IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) {
-                dev->irq = -1;
-                goto error;
-        }
-
         pnp_set_drvdata(pnp_dev, dev);
         dev->pnp_dev = pnp_dev;
 
@@ -1086,6 +1070,22 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
         device_set_wakeup_capable(&pnp_dev->dev, true);
         device_set_wakeup_enable(&pnp_dev->dev, true);
 
+        /* claim the resources */
+        error = -EBUSY;
+        dev->hw_io = pnp_port_start(pnp_dev, 0);
+        if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {
+                dev->hw_io = -1;
+                dev->irq = -1;
+                goto error;
+        }
+
+        dev->irq = pnp_irq(pnp_dev, 0);
+        if (request_irq(dev->irq, ene_isr,
+                        IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) {
+                dev->irq = -1;
+                goto error;
+        }
+
         error = rc_register_device(rdev);
         if (error < 0)
                 goto error;
diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
index 392d4be91f8f..4a3a238bcfbc 100644
--- a/drivers/media/rc/fintek-cir.c
+++ b/drivers/media/rc/fintek-cir.c
@@ -197,7 +197,7 @@ static int fintek_hw_detect(struct fintek_dev *fintek)
         /*
          * Newer reviews of this chipset uses port 8 instead of 5
          */
-        if ((chip != 0x0408) || (chip != 0x0804))
+        if ((chip != 0x0408) && (chip != 0x0804))
                 fintek->logical_dev_cir = LOGICAL_DEV_CIR_REV2;
         else
                 fintek->logical_dev_cir = LOGICAL_DEV_CIR_REV1;
@@ -514,16 +514,6 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
 
         spin_lock_init(&fintek->fintek_lock);
 
-        ret = -EBUSY;
-        /* now claim resources */
-        if (!request_region(fintek->cir_addr,
-                            fintek->cir_port_len, FINTEK_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,
-                        FINTEK_DRIVER_NAME, (void *)fintek))
-                goto failure;
-
         pnp_set_drvdata(pdev, fintek);
         fintek->pdev = pdev;
 
@@ -558,6 +548,16 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
         /* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */
         rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);
 
+        ret = -EBUSY;
+        /* now claim resources */
+        if (!request_region(fintek->cir_addr,
+                            fintek->cir_port_len, FINTEK_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,
+                        FINTEK_DRIVER_NAME, (void *)fintek))
+                goto failure;
+
         ret = rc_register_device(rdev);
         if (ret)
                 goto failure;
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 682009d76cdf..0e49c99abf68 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1515,16 +1515,6 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         /* initialize raw event */
         init_ir_raw_event(&itdev->rawir);
 
-        ret = -EBUSY;
-        /* now claim resources */
-        if (!request_region(itdev->cir_addr,
-                                dev_desc->io_region_size, ITE_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
-                        ITE_DRIVER_NAME, (void *)itdev))
-                goto failure;
-
         /* set driver data into the pnp device */
         pnp_set_drvdata(pdev, itdev);
         itdev->pdev = pdev;
@@ -1600,6 +1590,16 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         rdev->driver_name = ITE_DRIVER_NAME;
         rdev->map_name = RC_MAP_RC6_MCE;
 
+        ret = -EBUSY;
+        /* now claim resources */
+        if (!request_region(itdev->cir_addr,
+                                dev_desc->io_region_size, ITE_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
+                        ITE_DRIVER_NAME, (void *)itdev))
+                goto failure;
+
         ret = rc_register_device(rdev);
         if (ret)
                 goto failure;
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 144f3f55d765..8b2c071ac0ab 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1021,24 +1021,6 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         spin_lock_init(&nvt->nvt_lock);
         spin_lock_init(&nvt->tx.lock);
 
-        ret = -EBUSY;
-        /* now claim resources */
-        if (!request_region(nvt->cir_addr,
-                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
-                        NVT_DRIVER_NAME, (void *)nvt))
-                goto failure;
-
-        if (!request_region(nvt->cir_wake_addr,
-                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
-                        NVT_DRIVER_NAME, (void *)nvt))
-                goto failure;
-
         pnp_set_drvdata(pdev, nvt);
         nvt->pdev = pdev;
 
@@ -1085,6 +1067,24 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         rdev->tx_resolution = XYZ;
 #endif
 
+        ret = -EBUSY;
+        /* now claim resources */
+        if (!request_region(nvt->cir_addr,
+                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
+                        NVT_DRIVER_NAME, (void *)nvt))
+                goto failure;
+
+        if (!request_region(nvt->cir_wake_addr,
+                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
+                        NVT_DRIVER_NAME, (void *)nvt))
+                goto failure;
+
         ret = rc_register_device(rdev);
         if (ret)
                 goto failure;
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index af526586fa26..342c2c8c1ddf 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -991,39 +991,10 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
                 "(w: 0x%lX, e: 0x%lX, s: 0x%lX, i: %u)\n",
                 data->wbase, data->ebase, data->sbase, data->irq);
 
-        if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {
-                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
-                        data->wbase, data->wbase + WAKEUP_IOMEM_LEN - 1);
-                err = -EBUSY;
-                goto exit_free_data;
-        }
-
-        if (!request_region(data->ebase, EHFUNC_IOMEM_LEN, DRVNAME)) {
-                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
-                        data->ebase, data->ebase + EHFUNC_IOMEM_LEN - 1);
-                err = -EBUSY;
-                goto exit_release_wbase;
-        }
-
-        if (!request_region(data->sbase, SP_IOMEM_LEN, DRVNAME)) {
-                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
-                        data->sbase, data->sbase + SP_IOMEM_LEN - 1);
-                err = -EBUSY;
-                goto exit_release_ebase;
-        }
-
-        err = request_irq(data->irq, wbcir_irq_handler,
-                          IRQF_DISABLED, DRVNAME, device);
-        if (err) {
-                dev_err(dev, "Failed to claim IRQ %u\n", data->irq);
-                err = -EBUSY;
-                goto exit_release_sbase;
-        }
-
         led_trigger_register_simple("cir-tx", &data->txtrigger);
         if (!data->txtrigger) {
                 err = -ENOMEM;
-                goto exit_free_irq;
+                goto exit_free_data;
         }
 
         led_trigger_register_simple("cir-rx", &data->rxtrigger);
@@ -1062,9 +1033,38 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
         data->dev->priv = data;
         data->dev->dev.parent = &device->dev;
 
+        if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->wbase, data->wbase + WAKEUP_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_free_rc;
+        }
+
+        if (!request_region(data->ebase, EHFUNC_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->ebase, data->ebase + EHFUNC_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_release_wbase;
+        }
+
+        if (!request_region(data->sbase, SP_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->sbase, data->sbase + SP_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_release_ebase;
+        }
+
+        err = request_irq(data->irq, wbcir_irq_handler,
+                          IRQF_DISABLED, DRVNAME, device);
+        if (err) {
+                dev_err(dev, "Failed to claim IRQ %u\n", data->irq);
+                err = -EBUSY;
+                goto exit_release_sbase;
+        }
+
         err = rc_register_device(data->dev);
         if (err)
-                goto exit_free_rc;
+                goto exit_free_irq;
 
         device_init_wakeup(&device->dev, 1);
 
@@ -1072,14 +1072,6 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
 
         return 0;
 
-exit_free_rc:
-        rc_free_device(data->dev);
-exit_unregister_led:
-        led_classdev_unregister(&data->led);
-exit_unregister_rxtrigger:
-        led_trigger_unregister_simple(data->rxtrigger);
-exit_unregister_txtrigger:
-        led_trigger_unregister_simple(data->txtrigger);
 exit_free_irq:
         free_irq(data->irq, device);
 exit_release_sbase:
@@ -1088,6 +1080,14 @@ exit_release_ebase:
         release_region(data->ebase, EHFUNC_IOMEM_LEN);
 exit_release_wbase:
         release_region(data->wbase, WAKEUP_IOMEM_LEN);
+exit_free_rc:
+        rc_free_device(data->dev);
+exit_unregister_led:
+        led_classdev_unregister(&data->led);
+exit_unregister_rxtrigger:
+        led_trigger_unregister_simple(data->rxtrigger);
+exit_unregister_txtrigger:
+        led_trigger_unregister_simple(data->txtrigger);
 exit_free_data:
         kfree(data);
         pnp_set_drvdata(device, NULL);
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index db8e5084df06..863c755dd2b7 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -2923,6 +2923,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
          * not the JPEG end of frame ('ff d9').
          */
 
+        /* count the packets and their size */
+        sd->npkt++;
+        sd->pktsz += len;
+
 /*fixme: assumption about the following code:
  *      - there can be only one marker in a packet
  */
@@ -2945,10 +2949,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                 data += i;
         }
 
-        /* count the packets and their size */
-        sd->npkt++;
-        sd->pktsz += len;
-
         /* search backwards if there is a marker in the packet */
         for (i = len - 1; --i >= 0; ) {
                 if (data[i] != 0xff) {
diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c
index d23552323f45..c4c17fe76c0d 100644
--- a/drivers/media/video/marvell-ccic/mmp-driver.c
+++ b/drivers/media/video/marvell-ccic/mmp-driver.c
@@ -181,7 +181,6 @@ static int mmpcam_probe(struct platform_device *pdev)
         INIT_LIST_HEAD(&cam->devlist);
 
         mcam = &cam->mcam;
-        mcam->platform = MHP_Armada610;
         mcam->plat_power_up = mmpcam_power_up;
         mcam->plat_power_down = mmpcam_power_down;
         mcam->dev = &pdev->dev;
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index b06efd208328..7e9b2c612b03 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -246,28 +246,37 @@ int fimc_capture_resume(struct fimc_dev *fimc)
 
 }
 
-static unsigned int get_plane_size(struct fimc_frame *fr, unsigned int plane)
-{
-        if (!fr || plane >= fr->fmt->memplanes)
-                return 0;
-        return fr->f_width * fr->f_height * fr->fmt->depth[plane] / 8;
-}
-
-static int queue_setup(struct vb2_queue *vq,  const struct v4l2_format *pfmt,
+static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *pfmt,
                        unsigned int *num_buffers, unsigned int *num_planes,
                        unsigned int sizes[], void *allocators[])
 {
+        const struct v4l2_pix_format_mplane *pixm = NULL;
         struct fimc_ctx *ctx = vq->drv_priv;
-        struct fimc_fmt *fmt = ctx->d_frame.fmt;
+        struct fimc_frame *frame = &ctx->d_frame;
+        struct fimc_fmt *fmt = frame->fmt;
+        unsigned long wh;
         int i;
 
-        if (!fmt)
+        if (pfmt) {
+                pixm = &pfmt->fmt.pix_mp;
+                fmt = fimc_find_format(&pixm->pixelformat, NULL,
+                                       FMT_FLAGS_CAM | FMT_FLAGS_M2M, -1);
+                wh = pixm->width * pixm->height;
+        } else {
+                wh = frame->f_width * frame->f_height;
+        }
+
+        if (fmt == NULL)
                 return -EINVAL;
 
         *num_planes = fmt->memplanes;
 
         for (i = 0; i < fmt->memplanes; i++) {
-                sizes[i] = get_plane_size(&ctx->d_frame, i);
+                unsigned int size = (wh * fmt->depth[i]) / 8;
+                if (pixm)
+                        sizes[i] = max(size, pixm->plane_fmt[i].sizeimage);
+                else
+                        sizes[i] = size;
                 allocators[i] = ctx->fimc_dev->alloc_ctx;
         }
 
@@ -1383,7 +1392,7 @@ static int fimc_subdev_set_crop(struct v4l2_subdev *sd,
         fimc_capture_try_crop(ctx, r, crop->pad);
 
         if (crop->which == V4L2_SUBDEV_FORMAT_TRY) {
-                mutex_lock(&fimc->lock);
+                mutex_unlock(&fimc->lock);
                 *v4l2_subdev_get_try_crop(fh, crop->pad) = *r;
                 return 0;
         }
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c
index e184e650022a..e09ba7b0076e 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/drivers/media/video/s5p-fimc/fimc-core.c
@@ -1048,14 +1048,14 @@ static int fimc_m2m_g_fmt_mplane(struct file *file, void *fh,
  * @mask: the color flags to match
  * @index: offset in the fimc_formats array, ignored if negative
  */
-struct fimc_fmt *fimc_find_format(u32 *pixelformat, u32 *mbus_code,
+struct fimc_fmt *fimc_find_format(const u32 *pixelformat, const u32 *mbus_code,
                                   unsigned int mask, int index)
 {
         struct fimc_fmt *fmt, *def_fmt = NULL;
         unsigned int i;
         int id = 0;
 
-        if (index >= ARRAY_SIZE(fimc_formats))
+        if (index >= (int)ARRAY_SIZE(fimc_formats))
                 return NULL;
 
         for (i = 0; i < ARRAY_SIZE(fimc_formats); ++i) {
diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h
index a18291e648e2..84fd83550bd7 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.h
+++ b/drivers/media/video/s5p-fimc/fimc-core.h
@@ -718,7 +718,7 @@ void fimc_alpha_ctrl_update(struct fimc_ctx *ctx);
 int fimc_fill_format(struct fimc_frame *frame, struct v4l2_format *f);
 void fimc_adjust_mplane_format(struct fimc_fmt *fmt, u32 width, u32 height,
                                struct v4l2_pix_format_mplane *pix);
-struct fimc_fmt *fimc_find_format(u32 *pixelformat, u32 *mbus_code,
+struct fimc_fmt *fimc_find_format(const u32 *pixelformat, const u32 *mbus_code,
                                   unsigned int mask, int index);
 
 int fimc_check_scaler_ratio(struct fimc_ctx *ctx, int sw, int sh,
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index eb25756a07af..aedb970d13f6 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -530,7 +530,10 @@ static int soc_camera_open(struct file *file)
                 if (icl->reset)
                         icl->reset(icd->pdev);
 
+                /* Don't mess with the host during probe */
+                mutex_lock(&ici->host_lock);
                 ret = ici->ops->add(icd);
+                mutex_unlock(&ici->host_lock);
                 if (ret < 0) {
                         dev_err(icd->pdev, "Couldn't activate the camera: %d\n", ret);
                         goto eiciadd;
@@ -956,7 +959,7 @@ static void scan_add_host(struct soc_camera_host *ici)
 {
         struct soc_camera_device *icd;
 
-        mutex_lock(&list_lock);
+        mutex_lock(&ici->host_lock);
 
         list_for_each_entry(icd, &devices, list) {
                 if (icd->iface == ici->nr) {
@@ -967,7 +970,7 @@ static void scan_add_host(struct soc_camera_host *ici)
                 }
         }
 
-        mutex_unlock(&list_lock);
+        mutex_unlock(&ici->host_lock);
 }
 
 #ifdef CONFIG_I2C_BOARDINFO
@@ -1313,6 +1316,7 @@ int soc_camera_host_register(struct soc_camera_host *ici)
         list_add_tail(&ici->list, &hosts);
         mutex_unlock(&list_lock);
 
+        mutex_init(&ici->host_lock);
         scan_add_host(ici);
 
         return 0;
diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c
index f17ad98fcc5f..4b7132660a93 100644
--- a/drivers/media/video/videobuf2-dma-contig.c
+++ b/drivers/media/video/videobuf2-dma-contig.c
@@ -15,6 +15,7 @@
 #include <linux/dma-mapping.h>
 
 #include <media/videobuf2-core.h>
+#include <media/videobuf2-dma-contig.h>
 #include <media/videobuf2-memops.h>
 
 struct vb2_dc_conf {
@@ -85,7 +86,7 @@ static void *vb2_dma_contig_vaddr(void *buf_priv)
 {
         struct vb2_dc_buf *buf = buf_priv;
         if (!buf)
-                return 0;
+                return NULL;
 
         return buf->vaddr;
 }
diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c
index c41cb60245d6..504cd4cbe29e 100644
--- a/drivers/media/video/videobuf2-memops.c
+++ b/drivers/media/video/videobuf2-memops.c
@@ -55,6 +55,7 @@ struct vm_area_struct *vb2_get_vma(struct vm_area_struct *vma)
 
         return vma_copy;
 }
+EXPORT_SYMBOL_GPL(vb2_get_vma);
 
 /**
  * vb2_put_userptr() - release a userspace virtual memory area
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 58fc65f5c817..f2f482bec573 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -376,7 +376,7 @@ static int otp_select_filemode(struct mtd_file_info *mfi, int mode)
          * Make a fake call to mtd_read_fact_prot_reg() to check if OTP
          * operations are supported.
          */
-        if (mtd_read_fact_prot_reg(mtd, -1, -1, &retlen, NULL) == -EOPNOTSUPP)
+        if (mtd_read_fact_prot_reg(mtd, -1, 0, &retlen, NULL) == -EOPNOTSUPP)
                 return -EOPNOTSUPP;
 
         switch (mode) {
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 73416951f4c1..861ca8f7e47d 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -212,18 +212,17 @@ static int __devinit ams_delta_init(struct platform_device *pdev)
         /* Link the private data with the MTD structure */
         ams_delta_mtd->priv = this;
 
-        if (!request_mem_region(res->start, resource_size(res),
-                        dev_name(&pdev->dev))) {
-                dev_err(&pdev->dev, "request_mem_region failed\n");
-                err = -EBUSY;
-                goto out_free;
-        }
+        /*
+         * Don't try to request the memory region from here,
+         * it should have been already requested from the
+         * gpio-omap driver and requesting it again would fail.
+         */
 
         io_base = ioremap(res->start, resource_size(res));
         if (io_base == NULL) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 err = -EIO;
-                goto out_release_io;
+                goto out_free;
         }
 
         this->priv = io_base;
@@ -271,8 +270,6 @@ out_gpio:
         platform_set_drvdata(pdev, NULL);
         gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);
         iounmap(io_base);
-out_release_io:
-        release_mem_region(res->start, resource_size(res));
 out_free:
         kfree(ams_delta_mtd);
  out:
@@ -285,7 +282,6 @@ out_free:
 static int __devexit ams_delta_cleanup(struct platform_device *pdev)
 {
         void __iomem *io_base = platform_get_drvdata(pdev);
-        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         /* Release resources, unregister device */
         nand_release(ams_delta_mtd);
@@ -293,7 +289,6 @@ static int __devexit ams_delta_cleanup(struct platform_device *pdev)
         gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio));
         gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);
         iounmap(io_base);
-        release_mem_region(res->start, resource_size(res));
 
         /* Free the MTD device structure */
         kfree(ams_delta_mtd);
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 793b00138275..3463b469e657 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2173,9 +2173,10 @@ re_arm:
  * received frames (loopback). Since only the payload is given to this
  * function, it check for loopback.
  */
-static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length)
+static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length)
 {
         struct port *port;
+        int ret = RX_HANDLER_ANOTHER;
 
         if (length >= sizeof(struct lacpdu)) {
 
@@ -2184,11 +2185,12 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                 if (!port->slave) {
                         pr_warning("%s: Warning: port of slave %s is uninitialized\n",
                                    slave->dev->name, slave->dev->master->name);
-                        return;
+                        return ret;
                 }
 
                 switch (lacpdu->subtype) {
                 case AD_TYPE_LACPDU:
+                        ret = RX_HANDLER_CONSUMED;
                         pr_debug("Received LACPDU on port %d\n",
                                  port->actor_port_number);
                         /* Protect against concurrent state machines */
@@ -2198,6 +2200,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                         break;
 
                 case AD_TYPE_MARKER:
+                        ret = RX_HANDLER_CONSUMED;
                         // No need to convert fields to Little Endian since we don't use the marker's fields.
 
                         switch (((struct bond_marker *)lacpdu)->tlv_type) {
@@ -2219,6 +2222,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                         }
                 }
         }
+        return ret;
 }
 
 /**
@@ -2456,18 +2460,20 @@ out:
         return NETDEV_TX_OK;
 }
 
-void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
                           struct slave *slave)
 {
+        int ret = RX_HANDLER_ANOTHER;
         if (skb->protocol != PKT_TYPE_LACPDU)
-                return;
+                return ret;
 
         if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
-                return;
+                return ret;
 
         read_lock(&bond->lock);
-        bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
+        ret = bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
         read_unlock(&bond->lock);
+        return ret;
 }
 
 /*
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 235b2cc58b28..5ee7e3c45db7 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -274,7 +274,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave);
 void bond_3ad_handle_link_change(struct slave *slave, char link);
 int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);
 int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);
-void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
                           struct slave *slave);
 int bond_3ad_set_carrier(struct bonding *bond);
 void bond_3ad_update_lacp_rate(struct bonding *bond);
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index b4f1b4ac92c6..0f59c1564e53 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -342,26 +342,26 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
         _unlock_rx_hashtbl_bh(bond);
 }
 
-static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
+static int rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
                          struct slave *slave)
 {
         struct arp_pkt *arp;
 
         if (skb->protocol != cpu_to_be16(ETH_P_ARP))
-                return;
+                goto out;
 
         arp = (struct arp_pkt *) skb->data;
         if (!arp) {
                 pr_debug("Packet has no ARP data\n");
-                return;
+                goto out;
         }
 
         if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
-                return;
+                goto out;
 
         if (skb->len < sizeof(struct arp_pkt)) {
                 pr_debug("Packet is too small to be an ARP\n");
-                return;
+                goto out;
         }
 
         if (arp->op_code == htons(ARPOP_REPLY)) {
@@ -369,6 +369,8 @@ static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
                 rlb_update_entry_from_arp(bond, arp);
                 pr_debug("Server received an ARP Reply from client\n");
         }
+out:
+        return RX_HANDLER_ANOTHER;
 }
 
 /* Caller must hold bond lock for read */
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index bbb004354bbd..2ee8cf9e8a3b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1444,8 +1444,9 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
         struct sk_buff *skb = *pskb;
         struct slave *slave;
         struct bonding *bond;
-        void (*recv_probe)(struct sk_buff *, struct bonding *,
+        int (*recv_probe)(struct sk_buff *, struct bonding *,
                                 struct slave *);
+        int ret = RX_HANDLER_ANOTHER;
 
         skb = skb_share_check(skb, GFP_ATOMIC);
         if (unlikely(!skb))
@@ -1464,8 +1465,12 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
                 struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
 
                 if (likely(nskb)) {
-                        recv_probe(nskb, bond, slave);
+                        ret = recv_probe(nskb, bond, slave);
                         dev_kfree_skb(nskb);
+                        if (ret == RX_HANDLER_CONSUMED) {
+                                consume_skb(skb);
+                                return ret;
+                        }
                 }
         }
 
@@ -1487,7 +1492,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
                 memcpy(eth_hdr(skb)->h_dest, bond->dev->dev_addr, ETH_ALEN);
         }
 
-        return RX_HANDLER_ANOTHER;
+        return ret;
 }
 
 /* enslave device <slave> to bond device <master> */
@@ -2732,7 +2737,7 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
         }
 }
 
-static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
+static int bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
                          struct slave *slave)
 {
         struct arphdr *arp;
@@ -2740,7 +2745,7 @@ static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
         __be32 sip, tip;
 
         if (skb->protocol != __cpu_to_be16(ETH_P_ARP))
-                return;
+                return RX_HANDLER_ANOTHER;
 
         read_lock(&bond->lock);
 
@@ -2785,6 +2790,7 @@ static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
 
 out_unlock:
         read_unlock(&bond->lock);
+        return RX_HANDLER_ANOTHER;
 }
 
 /*
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 9f2bae6616d3..4581aa5ccaba 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -218,7 +218,7 @@ struct bonding {
         struct   slave *primary_slave;
         bool     force_primary;
         s32      slave_cnt; /* never change this value outside the attach/detach wrappers */
-        void     (*recv_probe)(struct sk_buff *, struct bonding *,
+        int     (*recv_probe)(struct sk_buff *, struct bonding *,
                                struct slave *);
         rwlock_t lock;
         rwlock_t curr_slave_lock;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index c9069a28832b..f4d2da0db1b1 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -3335,6 +3335,8 @@ static int __devinit ehea_probe_adapter(struct platform_device *dev,
                 goto out_shutdown_ports;
         }
 
+        /* Handle any events that might be pending. */
+        tasklet_hi_schedule(&adapter->neq_tasklet);
 
         ret = 0;
         goto out;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index ba21f9c72a21..9bbf1a275947 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1103,9 +1103,12 @@ msi_only:
                 adapter->flags |= IGB_FLAG_HAS_MSI;
 out:
         /* Notify the stack of the (possibly) reduced queue counts. */
+        rtnl_lock();
         netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
-        return netif_set_real_num_rx_queues(adapter->netdev,
-                                            adapter->num_rx_queues);
+        err = netif_set_real_num_rx_queues(adapter->netdev,
+                adapter->num_rx_queues);
+        rtnl_unlock();
+        return err;
 }
 
 /**
@@ -6706,18 +6709,7 @@ static int igb_resume(struct device *dev)
         pci_enable_wake(pdev, PCI_D3hot, 0);
         pci_enable_wake(pdev, PCI_D3cold, 0);
 
-        if (!rtnl_is_locked()) {
-                /*
-                 * shut up ASSERT_RTNL() warning in
-                 * netif_set_real_num_tx/rx_queues.
-                 */
-                rtnl_lock();
-                err = igb_init_interrupt_scheme(adapter);
-                rtnl_unlock();
-        } else {
-                err = igb_init_interrupt_scheme(adapter);
-        }
-        if (err) {
+        if (igb_init_interrupt_scheme(adapter)) {
                 dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
                 return -ENOMEM;
         }
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index f8dda009d3c0..5e313e9a252f 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -618,10 +618,8 @@ static void ks8851_irq_work(struct work_struct *work)
         netif_dbg(ks, intr, ks->netdev,
                   "%s: status 0x%04x\n", __func__, status);
 
-        if (status & IRQ_LCI) {
-                /* should do something about checking link status */
+        if (status & IRQ_LCI)
                 handled |= IRQ_LCI;
-        }
 
         if (status & IRQ_LDI) {
                 u16 pmecr = ks8851_rdreg16(ks, KS_PMECR);
@@ -684,6 +682,9 @@ static void ks8851_irq_work(struct work_struct *work)
 
         mutex_unlock(&ks->lock);
 
+        if (status & IRQ_LCI)
+                mii_check_link(&ks->mii);
+
         if (status & IRQ_TXI)
                 netif_wake_queue(ks->netdev);
 
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
index 9f3dbc4feadc..b07311eaa693 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
@@ -584,7 +584,6 @@ struct pch_gbe_hw_stats {
 /**
  * struct pch_gbe_adapter - board specific private data structure
  * @stats_lock: Spinlock structure for status
- * @tx_queue_lock:      Spinlock structure for transmit
  * @ethtool_lock:       Spinlock structure for ethtool
  * @irq_sem:            Semaphore for interrupt
  * @netdev:             Pointer of network device structure
@@ -609,7 +608,6 @@ struct pch_gbe_hw_stats {
 
 struct pch_gbe_adapter {
         spinlock_t stats_lock;
-        spinlock_t tx_queue_lock;
         spinlock_t ethtool_lock;
         atomic_t irq_sem;
         struct net_device *netdev;
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 9dc7e5023671..3787c64ee71c 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -645,14 +645,11 @@ static void pch_gbe_mac_set_pause_packet(struct pch_gbe_hw *hw)
  */
 static int pch_gbe_alloc_queues(struct pch_gbe_adapter *adapter)
 {
-        int size;
-
-        size = (int)sizeof(struct pch_gbe_tx_ring);
-        adapter->tx_ring = kzalloc(size, GFP_KERNEL);
+        adapter->tx_ring = kzalloc(sizeof(*adapter->tx_ring), GFP_KERNEL);
         if (!adapter->tx_ring)
                 return -ENOMEM;
-        size = (int)sizeof(struct pch_gbe_rx_ring);
-        adapter->rx_ring = kzalloc(size, GFP_KERNEL);
+
+        adapter->rx_ring = kzalloc(sizeof(*adapter->rx_ring), GFP_KERNEL);
         if (!adapter->rx_ring) {
                 kfree(adapter->tx_ring);
                 return -ENOMEM;
@@ -1169,7 +1166,6 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter,
         struct sk_buff *tmp_skb;
         unsigned int frame_ctrl;
         unsigned int ring_num;
-        unsigned long flags;
 
         /*-- Set frame control --*/
         frame_ctrl = 0;
@@ -1216,14 +1212,14 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter,
                         }
                 }
         }
-        spin_lock_irqsave(&tx_ring->tx_lock, flags);
+
         ring_num = tx_ring->next_to_use;
         if (unlikely((ring_num + 1) == tx_ring->count))
                 tx_ring->next_to_use = 0;
         else
                 tx_ring->next_to_use = ring_num + 1;
 
-        spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
+
         buffer_info = &tx_ring->buffer_info[ring_num];
         tmp_skb = buffer_info->skb;
 
@@ -1525,7 +1521,7 @@ pch_gbe_alloc_rx_buffers_pool(struct pch_gbe_adapter *adapter,
                                                 &rx_ring->rx_buff_pool_logic,
                                                 GFP_KERNEL);
         if (!rx_ring->rx_buff_pool) {
-                pr_err("Unable to allocate memory for the receive poll buffer\n");
+                pr_err("Unable to allocate memory for the receive pool buffer\n");
                 return -ENOMEM;
         }
         memset(rx_ring->rx_buff_pool, 0, size);
@@ -1644,15 +1640,17 @@ pch_gbe_clean_tx(struct pch_gbe_adapter *adapter,
         pr_debug("called pch_gbe_unmap_and_free_tx_resource() %d count\n",
                  cleaned_count);
         /* Recover from running out of Tx resources in xmit_frame */
+        spin_lock(&tx_ring->tx_lock);
         if (unlikely(cleaned && (netif_queue_stopped(adapter->netdev)))) {
                 netif_wake_queue(adapter->netdev);
                 adapter->stats.tx_restart_count++;
                 pr_debug("Tx wake queue\n");
         }
-        spin_lock(&adapter->tx_queue_lock);
+
         tx_ring->next_to_clean = i;
-        spin_unlock(&adapter->tx_queue_lock);
+
         pr_debug("next_to_clean : %d\n", tx_ring->next_to_clean);
+        spin_unlock(&tx_ring->tx_lock);
         return cleaned;
 }
 
@@ -2043,7 +2041,6 @@ static int pch_gbe_sw_init(struct pch_gbe_adapter *adapter)
                 return -ENOMEM;
         }
         spin_lock_init(&adapter->hw.miim_lock);
-        spin_lock_init(&adapter->tx_queue_lock);
         spin_lock_init(&adapter->stats_lock);
         spin_lock_init(&adapter->ethtool_lock);
         atomic_set(&adapter->irq_sem, 0);
@@ -2148,10 +2145,10 @@ static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                          tx_ring->next_to_use, tx_ring->next_to_clean);
                 return NETDEV_TX_BUSY;
         }
-        spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
 
         /* CRC,ITAG no support */
         pch_gbe_tx_queue(adapter, tx_ring, skb);
+        spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
         return NETDEV_TX_OK;
 }
 
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 00628d84342f..4f74b9762c29 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -63,8 +63,12 @@
 #define R8169_MSG_DEFAULT \
         (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN)
 
-#define TX_BUFFS_AVAIL(tp) \
-        (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1)
+#define TX_SLOTS_AVAIL(tp) \
+        (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx)
+
+/* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */
+#define TX_FRAGS_READY_FOR(tp,nr_frags) \
+        (TX_SLOTS_AVAIL(tp) >= (nr_frags + 1))
 
 /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
    The RTL chips use a 64 element hash table based on the Ethernet CRC. */
@@ -5494,7 +5498,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
         u32 opts[2];
         int frags;
 
-        if (unlikely(TX_BUFFS_AVAIL(tp) < skb_shinfo(skb)->nr_frags)) {
+        if (unlikely(!TX_FRAGS_READY_FOR(tp, skb_shinfo(skb)->nr_frags))) {
                 netif_err(tp, drv, dev, "BUG! Tx Ring full when queue awake!\n");
                 goto err_stop_0;
         }
@@ -5548,7 +5552,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
 
         mmiowb();
 
-        if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) {
+        if (!TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {
                 /* Avoid wrongly optimistic queue wake-up: rtl_tx thread must
                  * not miss a ring update when it notices a stopped queue.
                  */
@@ -5562,7 +5566,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
                  * can't.
                  */
                 smp_mb();
-                if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)
+                if (TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS))
                         netif_wake_queue(dev);
         }
 
@@ -5685,7 +5689,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
                  */
                 smp_mb();
                 if (netif_queue_stopped(dev) &&
-                    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
+                    TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {
                         netif_wake_queue(dev);
                 }
                 /*
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 8253d2155fe3..b95f2e1b33f0 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1354,7 +1354,7 @@ static int efx_probe_interrupts(struct efx_nic *efx)
         }
 
         /* RSS might be usable on VFs even if it is disabled on the PF */
-        efx->rss_spread = (efx->n_rx_channels > 1 ?
+        efx->rss_spread = ((efx->n_rx_channels > 1 || !efx_sriov_wanted(efx)) ?
                            efx->n_rx_channels : efx_vf_size(efx));
 
         return 0;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index ebacec1944ed..66a9bfe7b1c8 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -258,7 +258,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
 
 xmit_world:
         skb->ip_summed = ip_summed;
-        skb_set_dev(skb, vlan->lowerdev);
+        skb->dev = vlan->lowerdev;
         return dev_queue_xmit(skb);
 }
 
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 163559c16988..2ee56de7b0ca 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -1,5 +1,6 @@
 #include <linux/etherdevice.h>
 #include <linux/if_macvlan.h>
+#include <linux/if_vlan.h>
 #include <linux/interrupt.h>
 #include <linux/nsproxy.h>
 #include <linux/compat.h>
@@ -782,6 +783,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
         struct macvlan_dev *vlan;
         int ret;
         int vnet_hdr_len = 0;
+        int vlan_offset = 0;
+        int copied;
 
         if (q->flags & IFF_VNET_HDR) {
                 struct virtio_net_hdr vnet_hdr;
@@ -796,18 +799,48 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
                 if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))
                         return -EFAULT;
         }
+        copied = vnet_hdr_len;
+
+        if (!vlan_tx_tag_present(skb))
+                len = min_t(int, skb->len, len);
+        else {
+                int copy;
+                struct {
+                        __be16 h_vlan_proto;
+                        __be16 h_vlan_TCI;
+                } veth;
+                veth.h_vlan_proto = htons(ETH_P_8021Q);
+                veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
+
+                vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto);
+                len = min_t(int, skb->len + VLAN_HLEN, len);
+
+                copy = min_t(int, vlan_offset, len);
+                ret = skb_copy_datagram_const_iovec(skb, 0, iv, copied, copy);
+                len -= copy;
+                copied += copy;
+                if (ret || !len)
+                        goto done;
+
+                copy = min_t(int, sizeof(veth), len);
+                ret = memcpy_toiovecend(iv, (void *)&veth, copied, copy);
+                len -= copy;
+                copied += copy;
+                if (ret || !len)
+                        goto done;
+        }
 
-        len = min_t(int, skb->len, len);
-
-        ret = skb_copy_datagram_const_iovec(skb, 0, iv, vnet_hdr_len, len);
+        ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len);
+        copied += len;
 
+done:
         rcu_read_lock_bh();
         vlan = rcu_dereference_bh(q->vlan);
         if (vlan)
-                macvlan_count_rx(vlan, len, ret == 0, 0);
+                macvlan_count_rx(vlan, copied - vnet_hdr_len, ret == 0, 0);
         rcu_read_unlock_bh();
 
-        return ret ? ret : (len + vnet_hdr_len);
+        return ret ? ret : copied;
 }
 
 static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 00880edba048..425e201f597c 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -485,6 +485,7 @@ static const struct driver_info wwan_info = {
 /*-------------------------------------------------------------------------*/
 
 #define HUAWEI_VENDOR_ID        0x12D1
+#define NOVATEL_VENDOR_ID       0x1410
 
 static const struct usb_device_id       products [] = {
 /*
@@ -602,6 +603,21 @@ static const struct usb_device_id	products [] = {
  * because of bugs/quirks in a given product (like Zaurus, above).
  */
 {
+        /* Novatel USB551L */
+        /* This match must come *before* the generic CDC-ETHER match so that
+         * we get FLAG_WWAN set on the device, since it's descriptors are
+         * generic CDC-ETHER.
+         */
+        .match_flags    =   USB_DEVICE_ID_MATCH_VENDOR
+                 | USB_DEVICE_ID_MATCH_PRODUCT
+                 | USB_DEVICE_ID_MATCH_INT_INFO,
+        .idVendor               = NOVATEL_VENDOR_ID,
+        .idProduct              = 0xB001,
+        .bInterfaceClass        = USB_CLASS_COMM,
+        .bInterfaceSubClass     = USB_CDC_SUBCLASS_ETHERNET,
+        .bInterfaceProtocol     = USB_CDC_PROTO_NONE,
+        .driver_info = (unsigned long)&wwan_info,
+}, {
         USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET,
                         USB_CDC_PROTO_NONE),
         .driver_info = (unsigned long) &cdc_info,
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 80b837c88f0d..9f58330f1312 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -282,17 +282,32 @@ int usbnet_change_mtu (struct net_device *net, int new_mtu)
 }
 EXPORT_SYMBOL_GPL(usbnet_change_mtu);
 
+/* The caller must hold list->lock */
+static void __usbnet_queue_skb(struct sk_buff_head *list,
+                        struct sk_buff *newsk, enum skb_state state)
+{
+        struct skb_data *entry = (struct skb_data *) newsk->cb;
+
+        __skb_queue_tail(list, newsk);
+        entry->state = state;
+}
+
 /*-------------------------------------------------------------------------*/
 
 /* some LK 2.4 HCDs oopsed if we freed or resubmitted urbs from
  * completion callbacks.  2.5 should have fixed those bugs...
  */
 
-static void defer_bh(struct usbnet *dev, struct sk_buff *skb, struct sk_buff_head *list)
+static enum skb_state defer_bh(struct usbnet *dev, struct sk_buff *skb,
+                struct sk_buff_head *list, enum skb_state state)
 {
         unsigned long           flags;
+        enum skb_state          old_state;
+        struct skb_data *entry = (struct skb_data *) skb->cb;
 
         spin_lock_irqsave(&list->lock, flags);
+        old_state = entry->state;
+        entry->state = state;
         __skb_unlink(skb, list);
         spin_unlock(&list->lock);
         spin_lock(&dev->done.lock);
@@ -300,6 +315,7 @@ static void defer_bh(struct usbnet *dev, struct sk_buff *skb, struct sk_buff_hea
         if (dev->done.qlen == 1)
                 tasklet_schedule(&dev->bh);
         spin_unlock_irqrestore(&dev->done.lock, flags);
+        return old_state;
 }
 
 /* some work can't be done in tasklets, so we use keventd
@@ -340,7 +356,6 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
         entry = (struct skb_data *) skb->cb;
         entry->urb = urb;
         entry->dev = dev;
-        entry->state = rx_start;
         entry->length = 0;
 
         usb_fill_bulk_urb (urb, dev->udev, dev->in,
@@ -372,7 +387,7 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
                         tasklet_schedule (&dev->bh);
                         break;
                 case 0:
-                        __skb_queue_tail (&dev->rxq, skb);
+                        __usbnet_queue_skb(&dev->rxq, skb, rx_start);
                 }
         } else {
                 netif_dbg(dev, ifdown, dev->net, "rx: stopped\n");
@@ -423,16 +438,17 @@ static void rx_complete (struct urb *urb)
         struct skb_data         *entry = (struct skb_data *) skb->cb;
         struct usbnet           *dev = entry->dev;
         int                     urb_status = urb->status;
+        enum skb_state          state;
 
         skb_put (skb, urb->actual_length);
-        entry->state = rx_done;
+        state = rx_done;
         entry->urb = NULL;
 
         switch (urb_status) {
         /* success */
         case 0:
                 if (skb->len < dev->net->hard_header_len) {
-                        entry->state = rx_cleanup;
+                        state = rx_cleanup;
                         dev->net->stats.rx_errors++;
                         dev->net->stats.rx_length_errors++;
                         netif_dbg(dev, rx_err, dev->net,
@@ -471,7 +487,7 @@ static void rx_complete (struct urb *urb)
                                   "rx throttle %d\n", urb_status);
                 }
 block:
-                entry->state = rx_cleanup;
+                state = rx_cleanup;
                 entry->urb = urb;
                 urb = NULL;
                 break;
@@ -482,17 +498,18 @@ block:
                 // FALLTHROUGH
 
         default:
-                entry->state = rx_cleanup;
+                state = rx_cleanup;
                 dev->net->stats.rx_errors++;
                 netif_dbg(dev, rx_err, dev->net, "rx status %d\n", urb_status);
                 break;
         }
 
-        defer_bh(dev, skb, &dev->rxq);
+        state = defer_bh(dev, skb, &dev->rxq, state);
 
         if (urb) {
                 if (netif_running (dev->net) &&
-                    !test_bit (EVENT_RX_HALT, &dev->flags)) {
+                    !test_bit (EVENT_RX_HALT, &dev->flags) &&
+                    state != unlink_start) {
                         rx_submit (dev, urb, GFP_ATOMIC);
                         usb_mark_last_busy(dev->udev);
                         return;
@@ -579,16 +596,23 @@ EXPORT_SYMBOL_GPL(usbnet_purge_paused_rxq);
 static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
 {
         unsigned long           flags;
-        struct sk_buff          *skb, *skbnext;
+        struct sk_buff          *skb;
         int                     count = 0;
 
         spin_lock_irqsave (&q->lock, flags);
-        skb_queue_walk_safe(q, skb, skbnext) {
+        while (!skb_queue_empty(q)) {
                 struct skb_data         *entry;
                 struct urb              *urb;
                 int                     retval;
 
-                entry = (struct skb_data *) skb->cb;
+                skb_queue_walk(q, skb) {
+                        entry = (struct skb_data *) skb->cb;
+                        if (entry->state != unlink_start)
+                                goto found;
+                }
+                break;
+found:
+                entry->state = unlink_start;
                 urb = entry->urb;
 
                 /*
@@ -1040,8 +1064,7 @@ static void tx_complete (struct urb *urb)
         }
 
         usb_autopm_put_interface_async(dev->intf);
-        entry->state = tx_done;
-        defer_bh(dev, skb, &dev->txq);
+        (void) defer_bh(dev, skb, &dev->txq, tx_done);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -1097,7 +1120,6 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
         entry = (struct skb_data *) skb->cb;
         entry->urb = urb;
         entry->dev = dev;
-        entry->state = tx_start;
         entry->length = length;
 
         usb_fill_bulk_urb (urb, dev->udev, dev->out,
@@ -1156,7 +1178,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
                 break;
         case 0:
                 net->trans_start = jiffies;
-                __skb_queue_tail (&dev->txq, skb);
+                __usbnet_queue_skb(&dev->txq, skb, tx_start);
                 if (dev->txq.qlen >= TX_QLEN (dev))
                         netif_stop_queue (net);
         }
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index f7868c0d79ed..2062ea1d7c80 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1853,14 +1853,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         /*like read eeprom and so on */
         rtlpriv->cfg->ops->read_eeprom_info(hw);
 
-        if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
-                err = -ENODEV;
-                goto fail3;
-        }
-
-        rtlpriv->cfg->ops->init_sw_leds(hw);
-
         /*aspm */
         rtl_pci_init_aspm(hw);
 
@@ -1879,6 +1871,14 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                 goto fail3;
         }
 
+        if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
+                err = -ENODEV;
+                goto fail3;
+        }
+
+        rtlpriv->cfg->ops->init_sw_leds(hw);
+
         err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index d04dbda13f5a..a6049d7d51b3 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -971,11 +971,6 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
         rtlpriv->cfg->ops->read_chip_version(hw);
         /*like read eeprom and so on */
         rtlpriv->cfg->ops->read_eeprom_info(hw);
-        if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
-                goto error_out;
-        }
-        rtlpriv->cfg->ops->init_sw_leds(hw);
         err = _rtl_usb_init(hw);
         if (err)
                 goto error_out;
@@ -987,6 +982,11 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
                          "Can't allocate sw for mac80211\n");
                 goto error_out;
         }
+        if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
+                goto error_out;
+        }
+        rtlpriv->cfg->ops->init_sw_leds(hw);
 
         return 0;
 error_out:
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 8644d5372e7f..42cfcd9eb9aa 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -44,6 +44,7 @@
 #include <asm/ropes.h>
 #include <asm/mckinley.h>       /* for proc_mckinley_root */
 #include <asm/runway.h>         /* for proc_runway_root */
+#include <asm/page.h>           /* for PAGE0 */
 #include <asm/pdc.h>            /* for PDC_MODEL_* */
 #include <asm/pdcpat.h>         /* for is_pdc_pat() */
 #include <asm/parisc-device.h>
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 0f150f271c2a..1929c0c63b75 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -200,7 +200,7 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
                 return PCI_D1;
         case ACPI_STATE_D2:
                 return PCI_D2;
-        case ACPI_STATE_D3:
+        case ACPI_STATE_D3_HOT:
                 return PCI_D3hot;
         case ACPI_STATE_D3_COLD:
                 return PCI_D3cold;
@@ -223,7 +223,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
                 [PCI_D0] = ACPI_STATE_D0,
                 [PCI_D1] = ACPI_STATE_D1,
                 [PCI_D2] = ACPI_STATE_D2,
-                [PCI_D3hot] = ACPI_STATE_D3,
+                [PCI_D3hot] = ACPI_STATE_D3_HOT,
                 [PCI_D3cold] = ACPI_STATE_D3
         };
         int error = -EINVAL;
diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index 0a3594c7e912..bcbad8452a6f 100644
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -78,7 +78,7 @@ static int __devinit mfld_pb_probe(struct platform_device *pdev)
 
         input_set_capability(input, EV_KEY, KEY_POWER);
 
-        error = request_threaded_irq(irq, NULL, mfld_pb_isr, 0,
+        error = request_threaded_irq(irq, NULL, mfld_pb_isr, IRQF_NO_SUSPEND,
                         DRIVER_NAME, input);
         if (error) {
                 dev_err(&pdev->dev, "Unable to request irq %d for mfld power"
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 08c331130d88..3a9c17eced10 100644
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/ptp_clock_kernel.h>
+#include <linux/slab.h>
 
 #define STATION_ADDR_LEN        20
 #define PCI_DEVICE_ID_PCH_1588  0x8819
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index e70dd382a009..046fb1bd8619 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1431,7 +1431,10 @@ void devm_regulator_put(struct regulator *regulator)
 
         rc = devres_destroy(regulator->dev, devm_regulator_release,
                             devm_regulator_match, regulator);
-        WARN_ON(rc);
+        if (rc == 0)
+                regulator_put(regulator);
+        else
+                WARN_ON(rc);
 }
 EXPORT_SYMBOL_GPL(devm_regulator_put);
 
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 96579296f04d..17a58c56eebf 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -684,7 +684,7 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev,
                 }
 
                 new_val++;
-        } while (desc->min + desc->step + new_val <= desc->max);
+        } while (desc->min + desc->step * new_val <= desc->max);
 
         new_idx = tmp_idx;
         new_val = tmp_val;
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index ee15c68fb519..e756a0df3664 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -354,7 +354,7 @@ static void __rproc_free_vrings(struct rproc_vdev *rvdev, int i)
 {
         struct rproc *rproc = rvdev->rproc;
 
-        for (i--; i > 0; i--) {
+        for (i--; i >= 0; i--) {
                 struct rproc_vring *rvring = &rvdev->vring[i];
                 int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));
 
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index 42f5f829b3ee..029e421baaed 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@ -360,12 +360,11 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op)
                                                 &mpc5200_rtc_ops, THIS_MODULE);
         }
 
-        rtc->rtc->uie_unsupported = 1;
-
         if (IS_ERR(rtc->rtc)) {
                 err = PTR_ERR(rtc->rtc);
                 goto out_free_irq;
         }
+        rtc->rtc->uie_unsupported = 1;
 
         return 0;
 
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 351dc0b86fab..a3a056a9db67 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -218,6 +218,9 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
 
         if (!shost->shost_gendev.parent)
                 shost->shost_gendev.parent = dev ? dev : &platform_bus;
+        if (!dma_dev)
+                dma_dev = shost->shost_gendev.parent;
+
         shost->dma_dev = dma_dev;
 
         error = device_add(&shost->shost_gendev);
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index f74cc0602f3b..bc3cc6d91117 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1367,6 +1367,9 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
         struct qla_hw_data *ha = vha->hw;
         int rval = 0;
 
+        if (ha->flags.isp82xx_reset_hdlr_active)
+                return -EBUSY;
+
         rval = qla2x00_optrom_setup(bsg_job, vha, 0);
         if (rval)
                 return rval;
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 897731b93df2..62324a1d5573 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -15,7 +15,7 @@
  * | Mailbox commands             |       0x113e       | 0x112c-0x112e  |
  * |                              |                    | 0x113a         |
  * | Device Discovery             |       0x2086       | 0x2020-0x2022  |
- * | Queue Command and IO tracing |       0x302f       | 0x3006,0x3008  |
+ * | Queue Command and IO tracing |       0x3030       | 0x3006,0x3008  |
  * |                              |                    | 0x302d-0x302e  |
  * | DPC Thread                   |       0x401c       |                |
  * | Async Events                 |       0x505d       | 0x502b-0x502f  |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index f79844ce7122..ce42288049b5 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1715,13 +1715,24 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                                 res = DID_ERROR << 16;
                                 break;
                         }
-                } else {
+                } else if (lscsi_status != SAM_STAT_TASK_SET_FULL &&
+                            lscsi_status != SAM_STAT_BUSY) {
+                        /*
+                         * scsi status of task set and busy are considered to be
+                         * task not completed.
+                         */
+
                         ql_dbg(ql_dbg_io, fcport->vha, 0x301f,
                             "Dropped frame(s) detected (0x%x "
-                            "of 0x%x bytes).\n", resid, scsi_bufflen(cp));
+                            "of 0x%x bytes).\n", resid,
+                            scsi_bufflen(cp));
 
                         res = DID_ERROR << 16 | lscsi_status;
                         goto check_scsi_status;
+                } else {
+                        ql_dbg(ql_dbg_io, fcport->vha, 0x3030,
+                            "scsi_status: 0x%x, lscsi_status: 0x%x\n",
+                            scsi_status, lscsi_status);
                 }
 
                 res = DID_OK << 16 | lscsi_status;
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index f0528539bbbc..de722a933438 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3125,6 +3125,7 @@ qla82xx_need_reset_handler(scsi_qla_host_t *vha)
                 ql_log(ql_log_info, vha, 0x00b7,
                     "HW State: COLD/RE-INIT.\n");
                 qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_COLD);
+                qla82xx_set_rst_ready(ha);
                 if (ql2xmdenable) {
                         if (qla82xx_md_collect(vha))
                                 ql_log(ql_log_warn, vha, 0xb02c,
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index a2f999273a5f..7db803377c64 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3577,9 +3577,25 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
                                                 continue;
                                         /* Attempt a retry. */
                                         status = 1;
-                                } else
+                                } else {
                                         status = qla2x00_fabric_login(vha,
                                             fcport, &next_loopid);
+                                        if (status ==  QLA_SUCCESS) {
+                                                int status2;
+                                                uint8_t opts;
+
+                                                opts = 0;
+                                                if (fcport->flags &
+                                                    FCF_FCP2_DEVICE)
+                                                        opts |= BIT_1;
+                                                        status2 =
+                                                            qla2x00_get_port_database(
+                                                                vha, fcport,
+                                                                opts);
+                                                if (status2 != QLA_SUCCESS)
+                                                        status = 1;
+                                        }
+                                }
                         } else
                                 status = qla2x00_local_device_login(vha,
                                                                 fcport);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 3c13c0a6be63..a683e766d1ae 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -1017,6 +1017,9 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)
             !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha))
                 return;
 
+        if (ha->flags.isp82xx_reset_hdlr_active)
+                return;
+
         ha->isp_ops->read_optrom(vha, (uint8_t *)&hdr,
             ha->flt_region_npiv_conf << 2, sizeof(struct qla_npiv_header));
         if (hdr.version == __constant_cpu_to_le16(0xffff))
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 29d780c38040..f5fdb16bec9b 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,9 +7,9 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.03.07.13-k"
+#define QLA2XXX_VERSION      "8.04.00.03-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
-#define QLA_DRIVER_MINOR_VER    3
-#define QLA_DRIVER_PATCH_VER    7
+#define QLA_DRIVER_MINOR_VER    4
+#define QLA_DRIVER_PATCH_VER    0
 #define QLA_DRIVER_BETA_VER     3
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index efccd72c4a3e..1b3843117268 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -175,7 +175,8 @@ static void virtscsi_complete_free(void *buf)
 
         if (cmd->comp)
                 complete_all(cmd->comp);
-        mempool_free(cmd, virtscsi_cmd_pool);
+        else
+                mempool_free(cmd, virtscsi_cmd_pool);
 }
 
 static void virtscsi_ctrl_done(struct virtqueue *vq)
@@ -311,21 +312,22 @@ out:
 static int virtscsi_tmf(struct virtio_scsi *vscsi, struct virtio_scsi_cmd *cmd)
 {
         DECLARE_COMPLETION_ONSTACK(comp);
-        int ret;
+        int ret = FAILED;
 
         cmd->comp = &comp;
-        ret = virtscsi_kick_cmd(vscsi, vscsi->ctrl_vq, cmd,
-                               sizeof cmd->req.tmf, sizeof cmd->resp.tmf,
-                               GFP_NOIO);
-        if (ret < 0)
-                return FAILED;
+        if (virtscsi_kick_cmd(vscsi, vscsi->ctrl_vq, cmd,
+                              sizeof cmd->req.tmf, sizeof cmd->resp.tmf,
+                              GFP_NOIO) < 0)
+                goto out;
 
         wait_for_completion(&comp);
-        if (cmd->resp.tmf.response != VIRTIO_SCSI_S_OK &&
-            cmd->resp.tmf.response != VIRTIO_SCSI_S_FUNCTION_SUCCEEDED)
-                return FAILED;
+        if (cmd->resp.tmf.response == VIRTIO_SCSI_S_OK ||
+            cmd->resp.tmf.response == VIRTIO_SCSI_S_FUNCTION_SUCCEEDED)
+                ret = SUCCESS;
 
-        return SUCCESS;
+out:
+        mempool_free(cmd, virtscsi_cmd_pool);
+        return ret;
 }
 
 static int virtscsi_device_reset(struct scsi_cmnd *sc)
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index 70c3ffb981e7..e320ec24aa1b 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -60,7 +60,6 @@ static void core_clear_initiator_node_from_tpg(
         int i;
         struct se_dev_entry *deve;
         struct se_lun *lun;
-        struct se_lun_acl *acl, *acl_tmp;
 
         spin_lock_irq(&nacl->device_list_lock);
         for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
@@ -81,28 +80,7 @@ static void core_clear_initiator_node_from_tpg(
                 core_update_device_list_for_node(lun, NULL, deve->mapped_lun,
                         TRANSPORT_LUNFLAGS_NO_ACCESS, nacl, tpg, 0);
 
-                spin_lock(&lun->lun_acl_lock);
-                list_for_each_entry_safe(acl, acl_tmp,
-                                        &lun->lun_acl_list, lacl_list) {
-                        if (!strcmp(acl->initiatorname, nacl->initiatorname) &&
-                            (acl->mapped_lun == deve->mapped_lun))
-                                break;
-                }
-
-                if (!acl) {
-                        pr_err("Unable to locate struct se_lun_acl for %s,"
-                                " mapped_lun: %u\n", nacl->initiatorname,
-                                deve->mapped_lun);
-                        spin_unlock(&lun->lun_acl_lock);
-                        spin_lock_irq(&nacl->device_list_lock);
-                        continue;
-                }
-
-                list_del(&acl->lacl_list);
-                spin_unlock(&lun->lun_acl_lock);
-
                 spin_lock_irq(&nacl->device_list_lock);
-                kfree(acl);
         }
         spin_unlock_irq(&nacl->device_list_lock);
 }
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 29ca20dbd335..3b0c4e32ed7b 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -2044,7 +2044,7 @@ int vt_do_kdskled(int console, int cmd, unsigned long arg, int perm)
                 kbd->default_ledflagstate = ((arg >> 4) & 7);
                 set_leds();
                 spin_unlock_irqrestore(&kbd_event_lock, flags);
-                break;
+                return 0;
 
         /* the ioctls below only set the lights, not the functions */
         /* for those, see KDGKBLED and KDSKBLED above */
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 853db7a08a26..f82a7394756e 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -24,6 +24,7 @@
 #include <linux/if_arp.h>
 #include <linux/if_tun.h>
 #include <linux/if_macvlan.h>
+#include <linux/if_vlan.h>
 
 #include <net/sock.h>
 
@@ -286,8 +287,12 @@ static int peek_head_len(struct sock *sk)
 
         spin_lock_irqsave(&sk->sk_receive_queue.lock, flags);
         head = skb_peek(&sk->sk_receive_queue);
-        if (likely(head))
+        if (likely(head)) {
                 len = head->len;
+                if (vlan_tx_tag_present(head))
+                        len += VLAN_HLEN;
+        }
+
         spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags);
         return len;
 }
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 6468a297e341..39571f9e0162 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -22,7 +22,9 @@
 #include <linux/font.h>
 
 #include <asm/hardware.h>
+#include <asm/page.h>
 #include <asm/parisc-device.h>
+#include <asm/pdc.h>
 #include <asm/cacheflush.h>
 #include <asm/grfioctl.h>
 
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 26e83d7fdd6f..b0e2a4261afe 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -73,7 +73,7 @@ static void uvesafb_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *ns
         struct uvesafb_task *utask;
         struct uvesafb_ktask *task;
 
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_ADMIN))
                 return;
 
         if (msg->seq >= UVESAFB_TASKS_MAX)
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index cb4529c40d74..b7f5173ff9e9 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -365,7 +365,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         struct fb_info *fb_info;
         int fb_size;
         int val;
-        int ret;
+        int ret = 0;
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
@@ -458,26 +458,31 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         xenfb_init_shared_page(info, fb_info);
 
         ret = xenfb_connect_backend(dev, info);
-        if (ret < 0)
-                goto error;
+        if (ret < 0) {
+                xenbus_dev_fatal(dev, ret, "xenfb_connect_backend");
+                goto error_fb;
+        }
 
         ret = register_framebuffer(fb_info);
         if (ret) {
-                fb_deferred_io_cleanup(fb_info);
-                fb_dealloc_cmap(&fb_info->cmap);
-                framebuffer_release(fb_info);
                 xenbus_dev_fatal(dev, ret, "register_framebuffer");
-                goto error;
+                goto error_fb;
         }
         info->fb_info = fb_info;
 
         xenfb_make_preferred_console();
         return 0;
 
- error_nomem:
-        ret = -ENOMEM;
-        xenbus_dev_fatal(dev, ret, "allocating device memory");
- error:
+error_fb:
+        fb_deferred_io_cleanup(fb_info);
+        fb_dealloc_cmap(&fb_info->cmap);
+        framebuffer_release(fb_info);
+error_nomem:
+        if (!ret) {
+                ret = -ENOMEM;
+                xenbus_dev_fatal(dev, ret, "allocating device memory");
+        }
+error:
         xenfb_remove(dev);
         return ret;
 }
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 94243136f6bf..ea20c51d24c7 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -183,15 +183,17 @@ config XEN_ACPI_PROCESSOR
         depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ
         default m
         help
-          This ACPI processor uploads Power Management information to the Xen hypervisor.
-
-          To do that the driver parses the Power Management data and uploads said
-          information to the Xen hypervisor. Then the Xen hypervisor can select the
-          proper Cx and Pxx states. It also registers itslef as the SMM so that
-          other drivers (such as ACPI cpufreq scaling driver) will not load.
-
-          To compile this driver as a module, choose M here: the
-          module will be called xen_acpi_processor  If you do not know what to choose,
-          select M here. If the CPUFREQ drivers are built in, select Y here.
+          This ACPI processor uploads Power Management information to the Xen
+          hypervisor.
+
+          To do that the driver parses the Power Management data and uploads
+          said information to the Xen hypervisor. Then the Xen hypervisor can
+          select the proper Cx and Pxx states. It also registers itslef as the
+          SMM so that other drivers (such as ACPI cpufreq scaling driver) will
+          not load.
+
+          To compile this driver as a module, choose M here: the module will be
+          called xen_acpi_processor  If you do not know what to choose, select
+          M here. If the CPUFREQ drivers are built in, select Y here.
 
 endmenu