Merge branch 'snd-bugfix' into tx53-devel

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 14f816055fc1641549935ad941702a7dcc0fea37..d40e9d3a8ac4f668fee3316c23899e76bce1524e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1000,7 +1000,6 @@ config ARCH_MULTI_V7
        bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
        default y
        select ARCH_MULTI_V6_V7
-       select ARCH_VEXPRESS
        select CPU_V7
 
 config ARCH_MULTI_V6_V7

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 022dcdc256fb68932634242ccff9d86d37dfcb74..581eb4e7a3d5a74f5cddc750250cbe558ecea3ab 100644 (file)
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -266,7 +266,7 @@ static struct nand_ecclayout nandv2_hw_eccoob_4k = {
        }
 };
 
-static const char *part_probes[] = { "RedBoot", "cmdlinepart", "ofpart", NULL };
+static const char *part_probes[] = { "cmdlinepart", "ofpart", "RedBoot", NULL };
 
 static void memcpy32_fromio(void *trg, const void __iomem  *src, size_t size)
 {

diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index f3d2384b34bfb4a4c652606b460ecf9398734628..a11de5ea8949a08870d6241a23848cad51858a47 100644 (file)
--- a/drivers/pinctrl/pinctrl-imx.c
+++ b/drivers/pinctrl/pinctrl-imx.c
@@ -62,13 +62,16 @@ static const struct imx_pin_reg *imx_find_pin_reg(
        int i;
 
        for (i = 0; i < info->npin_regs; i++) {
-               pin_reg = &info->pin_regs[i];
-               if (pin_reg->pid != pin)
+               const struct imx_pin_reg *pr = &info->pin_regs[i];
+               if (pr->pid != pin)
                        continue;
-               if (!is_mux)
+               if (!is_mux) {
+                       pin_reg = pr;
                        break;
-               else if (pin_reg->mux_mode == (mux & IMX_MUX_MASK))
+               } else if (pr->mux_mode == (mux & IMX_MUX_MASK)) {
+                       pin_reg = pr;
                        break;
+               }
        }
 
        if (!pin_reg) {

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index f69d029b460716c7fdb233a7da34c9c2bb5ea8aa..bd6e7a42de46b6805a298dc503fceaae59e51c13 100644 (file)
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -385,8 +385,9 @@ EXPORT_SYMBOL_GPL(ci13xxx_add_device);
 
 void ci13xxx_remove_device(struct platform_device *pdev)
 {
+       int id = pdev->id;
        platform_device_unregister(pdev);
-       ida_simple_remove(&ci_ida, pdev->id);
+       ida_simple_remove(&ci_ida, id);
 }
 EXPORT_SYMBOL_GPL(ci13xxx_remove_device);
 
@@ -477,8 +478,7 @@ static int __devinit ci_hdrc_probe(struct platform_device *pdev)
 
        ret = ci_role_start(ci, ci->role);
        if (ret) {
-               dev_err(dev, "can't start %s role\n", ci_role(ci)->name);
-               ret = -ENODEV;
+               dev_err(dev, "can't start %s role: %d\n", ci_role(ci)->name, ret);
                goto rm_wq;
        }