lael-labs/linux

Documentation/DocBook/media/v4l/pixfmt.xml+2−2

@@ -986,13 +986,13 @@ http://www.thedirks.org/winnov/</ulink></para></entry> · 985 unmodified lines
986	<row id="V4L2-PIX-FMT-Y4">	986	<row id="V4L2-PIX-FMT-Y4">
987	<entry><constant>V4L2_PIX_FMT_Y4</constant></entry>	987	<entry><constant>V4L2_PIX_FMT_Y4</constant></entry>
988	<entry>'Y04 '</entry>	988	<entry>'Y04 '</entry>
989	<entry>Old 4-bit greyscale format. Only the least significant 4 bits of each byte are used,	989	<entry>Old 4-bit greyscale format. Only the most significant 4 bits of each byte are used,
990	the other bits are set to 0.</entry>	990	the other bits are set to 0.</entry>
991	</row>	991	</row>
992	<row id="V4L2-PIX-FMT-Y6">	992	<row id="V4L2-PIX-FMT-Y6">
993	<entry><constant>V4L2_PIX_FMT_Y6</constant></entry>	993	<entry><constant>V4L2_PIX_FMT_Y6</constant></entry>
994	<entry>'Y06 '</entry>	994	<entry>'Y06 '</entry>
995	<entry>Old 6-bit greyscale format. Only the least significant 6 bits of each byte are used,	995	<entry>Old 6-bit greyscale format. Only the most significant 6 bits of each byte are used,
996	the other bits are set to 0.</entry>	996	the other bits are set to 0.</entry>
997	</row>	997	</row>
998	</tbody>	998	</tbody>

Documentation/DocBook/media/v4l/v4l2.xml+1−1

     &sub-g-tuner;
     &sub-log-status;
     &sub-overlay;
+    &sub-prepare-buf;
     &sub-qbuf;
     &sub-querybuf;
     &sub-querycap;
     &sub-query-dv-preset;
     &sub-query-dv-timings;
     &sub-querystd;
-    &sub-prepare-buf;
     &sub-reqbufs;
     &sub-s-hw-freq-seek;
     &sub-streamon;

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml+2−3

 /></entry>
 	  </row>
 	  <row>
-	    <entry>__u32</entry>
+	    <entry>struct&nbsp;v4l2_format</entry>
 	    <entry><structfield>format</structfield></entry>
-	    <entry>Filled in by the application, preserved by the driver.
+	    <entry>Filled in by the application, preserved by the driver.</entry>
-	    See <xref linkend="v4l2-format" />.</entry>
 	  </row>
 	  <row>
 	    <entry>__u32</entry>

Documentation/DocBook/media/v4l/vidioc-dqevent.xml+1−1

@@ -89,7 +89,7 @@ · 88 unmodified lines
89	<row>	89	<row>
90	<entry></entry>	90	<entry></entry>
91	<entry>&v4l2-event-frame-sync;</entry>	91	<entry>&v4l2-event-frame-sync;</entry>
92	<entry><structfield>frame</structfield></entry>	92	<entry><structfield>frame_sync</structfield></entry>
93	<entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>	93	<entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>
94	</row>	94	</row>
95	<row>	95	<row>

Documentation/stable_kernel_rules.txt+6−0

    marked CONFIG_BROKEN), an oops, a hang, data corruption, a real
    security issue, or some "oh, that's not good" issue.  In short, something
    critical.
+ - Serious issues as reported by a user of a distribution kernel may also
+   be considered if they fix a notable performance or interactivity issue.
+   As these fixes are not as obvious and have a higher risk of a subtle
+   regression they should only be submitted by a distribution kernel
+   maintainer and include an addendum linking to a bugzilla entry if it
+   exists and additional information on the user-visible impact.
  - New device IDs and quirks are also accepted.
  - No "theoretical race condition" issues, unless an explanation of how the
    race can be exploited is also provided.

Makefile+1−1

@@ -1,7 +1,7 @@
1	VERSION = 3	1	VERSION = 3
2	PATCHLEVEL = 5	2	PATCHLEVEL = 5
3	SUBLEVEL = 0	3	SUBLEVEL = 0
4	EXTRAVERSION = -rc4	4	EXTRAVERSION = -rc5
5	NAME = Saber-toothed Squirrel	5	NAME = Saber-toothed Squirrel
6		6
7	# DOCUMENTATION	7	# DOCUMENTATION

arch/arm/mach-exynos/Kconfig+4−4

@@ -212,7 +212,7 @@ config MACH_SMDKV310 · 211 unmodified lines
212	select EXYNOS_DEV_SYSMMU	212	select EXYNOS_DEV_SYSMMU
213	select EXYNOS4_DEV_AHCI	213	select EXYNOS4_DEV_AHCI
214	select SAMSUNG_DEV_KEYPAD	214	select SAMSUNG_DEV_KEYPAD
215	select EXYNOS4_DEV_DMA	215	select EXYNOS_DEV_DMA
216	select SAMSUNG_DEV_PWM	216	select SAMSUNG_DEV_PWM
217	select EXYNOS4_DEV_USB_OHCI	217	select EXYNOS4_DEV_USB_OHCI
218	select EXYNOS4_SETUP_FIMD0	218	select EXYNOS4_SETUP_FIMD0
@@ -264,7 +264,7 @@ config MACH_UNIVERSAL_C210 · 45 unmodified lines
264	select S5P_DEV_ONENAND	264	select S5P_DEV_ONENAND
265	select S5P_DEV_TV	265	select S5P_DEV_TV
266	select EXYNOS_DEV_SYSMMU	266	select EXYNOS_DEV_SYSMMU
267	select EXYNOS4_DEV_DMA	267	select EXYNOS_DEV_DMA
268	select EXYNOS_DEV_DRM	268	select EXYNOS_DEV_DRM
269	select EXYNOS4_SETUP_FIMD0	269	select EXYNOS4_SETUP_FIMD0
270	select EXYNOS4_SETUP_I2C1	270	select EXYNOS4_SETUP_I2C1
@@ -303,7 +303,7 @@ config MACH_NURI · 32 unmodified lines
303	select S5P_DEV_MFC	303	select S5P_DEV_MFC
304	select S5P_DEV_USB_EHCI	304	select S5P_DEV_USB_EHCI
305	select S5P_SETUP_MIPIPHY	305	select S5P_SETUP_MIPIPHY
306	select EXYNOS4_DEV_DMA	306	select EXYNOS_DEV_DMA
307	select EXYNOS_DEV_DRM	307	select EXYNOS_DEV_DRM
308	select EXYNOS4_SETUP_FIMC	308	select EXYNOS4_SETUP_FIMC
309	select EXYNOS4_SETUP_FIMD0	309	select EXYNOS4_SETUP_FIMD0
@@ -341,7 +341,7 @@ config MACH_ORIGEN · 31 unmodified lines
341	select SAMSUNG_DEV_PWM	341	select SAMSUNG_DEV_PWM
342	select EXYNOS_DEV_DRM	342	select EXYNOS_DEV_DRM
343	select EXYNOS_DEV_SYSMMU	343	select EXYNOS_DEV_SYSMMU
344	select EXYNOS4_DEV_DMA	344	select EXYNOS_DEV_DMA
345	select EXYNOS4_DEV_USB_OHCI	345	select EXYNOS4_DEV_USB_OHCI
346	select EXYNOS4_SETUP_FIMD0	346	select EXYNOS4_SETUP_FIMD0
347	select EXYNOS4_SETUP_SDHCI	347	select EXYNOS4_SETUP_SDHCI

arch/arm/mach-imx/clk-imx6q.c+4−2

 	ssi2, ssi3, uart_ipg, uart_serial, usboh3, usdhc1, usdhc2, usdhc3,
 	usdhc4, vdo_axi, vpu_axi, cko1, pll1_sys, pll2_bus, pll3_usb_otg,
 	pll4_audio, pll5_video, pll6_mlb, pll7_usb_host, pll8_enet, ssi1_ipg,
-	ssi2_ipg, ssi3_ipg, clk_max
+	ssi2_ipg, ssi3_ipg, rom,
+	clk_max
 };
 static struct clk *clk[clk_max];
 static enum mx6q_clks const clks_init_on[] __initconst = {
-	mmdc_ch0_axi, mmdc_ch1_axi,
+	mmdc_ch0_axi, rom,
 };
 int __init mx6q_clocks_init(void)
 	clk[gpmi_bch]     = imx_clk_gate2("gpmi_bch",      "usdhc4",            base + 0x78, 26);
 	clk[gpmi_io]      = imx_clk_gate2("gpmi_io",       "enfc",              base + 0x78, 28);
 	clk[gpmi_apb]     = imx_clk_gate2("gpmi_apb",      "usdhc3",            base + 0x78, 30);
+	clk[rom]          = imx_clk_gate2("rom",           "ahb",               base + 0x7c, 0);
 	clk[sata]         = imx_clk_gate2("sata",          "ipg",               base + 0x7c, 4);
 	clk[sdma]         = imx_clk_gate2("sdma",          "ahb",               base + 0x7c, 6);
 	clk[spba]         = imx_clk_gate2("spba",          "ipg",               base + 0x7c, 12);

arch/arm/mach-omap2/board-flash.c+0−5

 	gpmc_onenand_init(&board_onenand_data);
 }
-#else
-void
-__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
-{
-}
 #endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */
 #if defined(CONFIG_MTD_NAND_OMAP2) || \

arch/arm/mach-omap2/clock44xx_data.c+4−1

 	if (cpu_is_omap443x()) {
 		cpu_mask = RATE_IN_4430;
 		cpu_clkflg = CK_443X;
-	} else if (cpu_is_omap446x()) {
+	} else if (cpu_is_omap446x() || cpu_is_omap447x()) {
 		cpu_mask = RATE_IN_4460 | RATE_IN_4430;
 		cpu_clkflg = CK_446X | CK_443X;
+		if (cpu_is_omap447x())
+			pr_warn("WARNING: OMAP4470 clock data incomplete!\n");
 	} else {
 		return 0;
 	}

arch/arm/mach-shmobile/board-armadillo800eva.c+1−0

@@ -779,6 +779,7 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") · 778 unmodified lines
779	.init_irq = r8a7740_init_irq,	779	.init_irq = r8a7740_init_irq,
780	.handle_irq = shmobile_handle_irq_intc,	780	.handle_irq = shmobile_handle_irq_intc,
781	.init_machine = eva_init,	781	.init_machine = eva_init,
		782	.init_late = shmobile_init_late,
782	.timer = &shmobile_timer,	783	.timer = &shmobile_timer,
783	.dt_compat = eva_boards_compat_dt,	784	.dt_compat = eva_boards_compat_dt,
784	MACHINE_END	785	MACHINE_END

arch/arm/mach-shmobile/board-kzm9d.c+1−0

@@ -80,6 +80,7 @@ DT_MACHINE_START(KZM9D_DT, "kzm9d") · 79 unmodified lines
80	.init_irq = emev2_init_irq,	80	.init_irq = emev2_init_irq,
81	.handle_irq = gic_handle_irq,	81	.handle_irq = gic_handle_irq,
82	.init_machine = kzm9d_add_standard_devices,	82	.init_machine = kzm9d_add_standard_devices,
		83	.init_late = shmobile_init_late,
83	.timer = &shmobile_timer,	84	.timer = &shmobile_timer,
84	.dt_compat = kzm9d_boards_compat_dt,	85	.dt_compat = kzm9d_boards_compat_dt,
85	MACHINE_END	86	MACHINE_END

arch/arm/mach-shmobile/board-kzm9g.c+1−0

@@ -455,6 +455,7 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g") · 454 unmodified lines
455	.init_irq = sh73a0_init_irq,	455	.init_irq = sh73a0_init_irq,
456	.handle_irq = gic_handle_irq,	456	.handle_irq = gic_handle_irq,
457	.init_machine = kzm_init,	457	.init_machine = kzm_init,
		458	.init_late = shmobile_init_late,
458	.timer = &shmobile_timer,	459	.timer = &shmobile_timer,
459	.dt_compat = kzm9g_boards_compat_dt,	460	.dt_compat = kzm9g_boards_compat_dt,
460	MACHINE_END	461	MACHINE_END

arch/arm/mach-shmobile/board-mackerel.c+3−0

@@ -1512,6 +1512,9 @@ static void __init mackerel_init(void) · 1511 unmodified lines
1512	gpio_request(GPIO_FN_SDHID0_1, NULL);	1512	gpio_request(GPIO_FN_SDHID0_1, NULL);
1513	gpio_request(GPIO_FN_SDHID0_0, NULL);	1513	gpio_request(GPIO_FN_SDHID0_0, NULL);
1514		1514
		1515	/* SDHI0 PORT172 card-detect IRQ26 */
		1516	gpio_request(GPIO_FN_IRQ26_172, NULL);
		1517
1515	#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)	1518	#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
1516	/* enable SDHI1 */	1519	/* enable SDHI1 */
1517	gpio_request(GPIO_FN_SDHICMD1, NULL);	1520	gpio_request(GPIO_FN_SDHICMD1, NULL);

arch/arm/mach-shmobile/clock-sh73a0.c+4−4

 enum { MSTP001,
 	MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100,
-	MSTP219,
+	MSTP219, MSTP218,
 	MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
-	MSTP331, MSTP329, MSTP325, MSTP323, MSTP318,
+	MSTP331, MSTP329, MSTP325, MSTP323,
 	MSTP314, MSTP313, MSTP312, MSTP311,
 	MSTP303, MSTP302, MSTP301, MSTP300,
 	MSTP411, MSTP410, MSTP403,
 	[MSTP116] = MSTP(&div4_clks[DIV4_HP], SMSTPCR1, 16, 0), /* IIC0 */
 	[MSTP100] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 0, 0), /* LCDC0 */
 	[MSTP219] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 19, 0), /* SCIFA7 */
+	[MSTP218] = MSTP(&div4_clks[DIV4_HP], SMSTPCR2, 18, 0), /* SY-DMAC */
 	[MSTP207] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 7, 0), /* SCIFA5 */
 	[MSTP206] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 6, 0), /* SCIFB */
 	[MSTP204] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 4, 0), /* SCIFA0 */
 	[MSTP329] = MSTP(&r_clk, SMSTPCR3, 29, 0), /* CMT10 */
 	[MSTP325] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 25, 0), /* IrDA */
 	[MSTP323] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 23, 0), /* IIC1 */
-	[MSTP318] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 18, 0), /* SY-DMAC */
 	[MSTP314] = MSTP(&div6_clks[DIV6_SDHI0], SMSTPCR3, 14, 0), /* SDHI0 */
 	[MSTP313] = MSTP(&div6_clks[DIV6_SDHI1], SMSTPCR3, 13, 0), /* SDHI1 */
 	[MSTP312] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 12, 0), /* MMCIF0 */
 	CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[MSTP116]), /* I2C0 */
 	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
 	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */
+	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */
 	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
 	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */
 	CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */
 	CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */
 	CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* I2C1 */
-	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP318]), /* SY-DMAC */
 	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */
 	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */
 	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMCIF0 */

arch/arm/mach-shmobile/intc-r8a7779.c+7−0

 #define INT2SMSKCR3 0xfe7822ac
 #define INT2SMSKCR4 0xfe7822b0
+#define INT2NTSR0 0xfe700060
+#define INT2NTSR1 0xfe700064
 static int r8a7779_set_wake(struct irq_data *data, unsigned int on)
 {
 	return 0; /* always allow wakeup */
 	gic_init(0, 29, gic_dist_base, gic_cpu_base);
 	gic_arch_extn.irq_set_wake = r8a7779_set_wake;
+	/* route all interrupts to ARM */
+	__raw_writel(0xffffffff, INT2NTSR0);
+	__raw_writel(0x3fffffff, INT2NTSR1);
 	/* unmask all known interrupts in INTCS2 */
 	__raw_writel(0xfffffff0, INT2SMSKCR0);
 	__raw_writel(0xfff7ffff, INT2SMSKCR1);

arch/arm/mach-shmobile/platsmp.c+5−0

 #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \
 			of_machine_is_compatible("renesas,sh73a0"))
 #define is_r8a7779() machine_is_marzen()
+#ifdef CONFIG_ARCH_EMEV2
 #define is_emev2() of_machine_is_compatible("renesas,emev2")
+#else
+#define is_emev2() (0)
+#endif
 static unsigned int __init shmobile_smp_get_core_count(void)
 {

arch/arm/mach-shmobile/setup-sh7372.c+1−1

@@ -484,7 +484,7 @@ static const struct sh_dmae_slave_config sh7372_dmae_slaves[] = { · 483 unmodified lines
484	},	484	},
485	};	485	};
486		486
487	#define SH7372_CHCLR 0x220	487	#define SH7372_CHCLR (0x220 - 0x20)
488		488
489	static const struct sh_dmae_channel sh7372_dmae_channels[] = {	489	static const struct sh_dmae_channel sh7372_dmae_channels[] = {
490	{	490	{

arch/arm/mm/dma-mapping.c+1−1

@@ -1067,7 +1067,7 @@ static struct page *__iommu_alloc_buffer(struct device dev, size_t size, gfp_t · 1066 unmodified lines
1067	return NULL;	1067	return NULL;
1068		1068
1069	while (count) {	1069	while (count) {
1070	int j, order = __ffs(count);	1070	int j, order = __fls(count);
1071		1071
1072	pages[i] = alloc_pages(gfp \| __GFP_NOWARN, order);	1072	pages[i] = alloc_pages(gfp \| __GFP_NOWARN, order);
1073	while (!pages[i] && order)	1073	while (!pages[i] && order)

arch/arm/plat-mxc/include/mach/mx2_cam.h+2−0

 #ifndef __MACH_MX2_CAM_H_
 #define __MACH_MX2_CAM_H_
+#define MX2_CAMERA_SWAP16		(1 << 0)
 #define MX2_CAMERA_EXT_VSYNC		(1 << 1)
 #define MX2_CAMERA_CCIR			(1 << 2)
 #define MX2_CAMERA_CCIR_INTERLACE	(1 << 3)
 #define MX2_CAMERA_GATED_CLOCK		(1 << 5)
 #define MX2_CAMERA_INV_DATA		(1 << 6)
 #define MX2_CAMERA_PCLK_SAMPLE_RISING	(1 << 7)
+#define MX2_CAMERA_PACK_DIR_MSB		(1 << 8)
 /**
  * struct mx2_camera_platform_data - optional platform data for mx2_camera

arch/arm/plat-samsung/include/plat/map-s3c.h+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	#define S3C24XX_VA_WATCHDOG S3C_VA_WATCHDOG	22	#define S3C24XX_VA_WATCHDOG S3C_VA_WATCHDOG
23		23
24	#define S3C2412_VA_SSMC S3C_ADDR_CPU(0x00000000)	24	#define S3C2412_VA_SSMC S3C_ADDR_CPU(0x00000000)
25	#define S3C2412_VA_EBI S3C_ADDR_CPU(0x00010000)	25	#define S3C2412_VA_EBI S3C_ADDR_CPU(0x00100000)
26		26
27	#define S3C2410_PA_UART (0x50000000)	27	#define S3C2410_PA_UART (0x50000000)
28	#define S3C24XX_PA_UART S3C2410_PA_UART	28	#define S3C24XX_PA_UART S3C2410_PA_UART

arch/arm/plat-samsung/include/plat/watchdog-reset.h+1−1

@@ -25,7 +25,7 @@ static inline void arch_wdt_reset(void) · 24 unmodified lines
25		25
26	__raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */	26	__raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */
27		27
28	if (s3c2410_wdtclk)	28	if (!IS_ERR(s3c2410_wdtclk))
29	clk_enable(s3c2410_wdtclk);	29	clk_enable(s3c2410_wdtclk);
30		30
31	/* put initial values into count and data */	31	/* put initial values into count and data */

arch/m68k/platform/coldfire/clk.c+7−0

@@ -42,4 +42,11 @@ unsigned long clk_get_rate(struct clk *clk) · 41 unmodified lines
42	return MCF_CLK;	42	return MCF_CLK;
43	}	43	}
44	EXPORT_SYMBOL(clk_get_rate);	44	EXPORT_SYMBOL(clk_get_rate);
		45
		46	struct clk devm_clk_get(struct device dev, const char *id)
		47	{
		48	return NULL;
		49	}
		50	EXPORT_SYMBOL(devm_clk_get);
		51
45	/***************************************************************************/	52	/***************************************************************************/

arch/powerpc/include/asm/hw_irq.h+5−0

 /* include/linux/interrupt.h needs hard_irq_disable to be a macro */
 #define hard_irq_disable	hard_irq_disable
+static inline bool lazy_irq_pending(void)
+{
+	return !!(get_paca()->irq_happened & ~PACA_IRQ_HARD_DIS);
+}
 /*
  * This is called by asynchronous interrupts to conditionally
  * re-enable hard interrupts when soft-disabled after having

arch/powerpc/kernel/entry_64.S+40−57

 	mtmsrd	r10,1		  /* Update machine state */
 #endif /* CONFIG_PPC_BOOK3E */
-#ifdef CONFIG_PREEMPT
 	clrrdi	r9,r1,THREAD_SHIFT	/* current_thread_info() */
-	li	r0,_TIF_NEED_RESCHED	/* bits to check */
 	ld	r3,_MSR(r1)
 	ld	r4,TI_FLAGS(r9)
-	/* Move MSR_PR bit in r3 to _TIF_SIGPENDING position in r0 */
-	rlwimi	r0,r3,32+TIF_SIGPENDING-MSR_PR_LG,_TIF_SIGPENDING
-	and.	r0,r4,r0	/* check NEED_RESCHED and maybe SIGPENDING */
-	bne	do_work
-#else /* !CONFIG_PREEMPT */
-	ld	r3,_MSR(r1)	/* Returning to user mode? */
 	andi.	r3,r3,MSR_PR
-	beq	restore		/* if not, just restore regs and return */
+	beq	resume_kernel
 	/* Check current_thread_info()->flags */
+	andi.	r0,r4,_TIF_USER_WORK_MASK
+	beq	restore
+	andi.	r0,r4,_TIF_NEED_RESCHED
+	beq	1f
+	bl	.restore_interrupts
+	bl	.schedule
+	b	.ret_from_except_lite
+1:	bl	.save_nvgprs
+	bl	.restore_interrupts
+	addi	r3,r1,STACK_FRAME_OVERHEAD
+	bl	.do_notify_resume
+	b	.ret_from_except
+resume_kernel:
+#ifdef CONFIG_PREEMPT
+	/* Check if we need to preempt */
+	andi.	r0,r4,_TIF_NEED_RESCHED
+	beq+	restore
+	/* Check that preempt_count() == 0 and interrupts are enabled */
+	lwz	r8,TI_PREEMPT(r9)
+	cmpwi	cr1,r8,0
+	ld	r0,SOFTE(r1)
+	cmpdi	r0,0
+	crandc	eq,cr1*4+eq,eq
+	bne	restore
+	/*
+	 * Here we are preempting the current task. We want to make
+	 * sure we are soft-disabled first
+	 */
+	SOFT_DISABLE_INTS(r3,r4)
+1:	bl	.preempt_schedule_irq
+	/* Re-test flags and eventually loop */
 	clrrdi	r9,r1,THREAD_SHIFT
 	ld	r4,TI_FLAGS(r9)
-	andi.	r0,r4,_TIF_USER_WORK_MASK
+	andi.	r0,r4,_TIF_NEED_RESCHED
-	bne	do_work
+	bne	1b
-#endif /* !CONFIG_PREEMPT */
+#endif /* CONFIG_PREEMPT */
 	.globl	fast_exc_return_irq
 fast_exc_return_irq:
 #endif /* CONFIG_PPC_BOOK3E */
 1:	b	.ret_from_except /* What else to do here ? */
-3:
-do_work:
-#ifdef CONFIG_PREEMPT
-	andi.	r0,r3,MSR_PR	/* Returning to user mode? */
-	bne	user_work
-	/* Check that preempt_count() == 0 and interrupts are enabled */
-	lwz	r8,TI_PREEMPT(r9)
-	cmpwi	cr1,r8,0
-	ld	r0,SOFTE(r1)
-	cmpdi	r0,0
-	crandc	eq,cr1*4+eq,eq
-	bne	restore
-	/*
-	 * Here we are preempting the current task. We want to make
-	 * sure we are soft-disabled first
-	 */
-	SOFT_DISABLE_INTS(r3,r4)
-1:	bl	.preempt_schedule_irq
-	/* Re-test flags and eventually loop */
-	clrrdi	r9,r1,THREAD_SHIFT
-	ld	r4,TI_FLAGS(r9)
-	andi.	r0,r4,_TIF_NEED_RESCHED
-	bne	1b
-	b	restore
-user_work:
-#endif /* CONFIG_PREEMPT */
-	andi.	r0,r4,_TIF_NEED_RESCHED
-	beq	1f
-	bl	.restore_interrupts
-	bl	.schedule
-	b	.ret_from_except_lite
-1:	bl	.save_nvgprs
-	bl	.restore_interrupts
-	addi	r3,r1,STACK_FRAME_OVERHEAD
-	bl	.do_notify_resume
-	b	.ret_from_except
 unrecov_restore:
 	addi	r3,r1,STACK_FRAME_OVERHEAD
 	bl	.unrecoverable_exception

arch/powerpc/kernel/irq.c+1−1

@@ -277,7 +277,7 @@ EXPORT_SYMBOL(arch_local_irq_restore); · 276 unmodified lines
277	* NOTE: This is called with interrupts hard disabled but not marked	277	* NOTE: This is called with interrupts hard disabled but not marked
278	* as such in paca->irq_happened, so we need to resync this.	278	* as such in paca->irq_happened, so we need to resync this.
279	*/	279	*/
280	void restore_interrupts(void)	280	void notrace restore_interrupts(void)
281	{	281	{
282	if (irqs_disabled()) {	282	if (irqs_disabled()) {
283	local_paca->irq_happened \|= PACA_IRQ_HARD_DIS;	283	local_paca->irq_happened \|= PACA_IRQ_HARD_DIS;

arch/powerpc/kernel/prom_init.c+2−2

@@ -1312,7 +1312,7 @@ static struct opal_secondary_data { · 1311 unmodified lines
1312		1312
1313	extern char opal_secondary_entry;	1313	extern char opal_secondary_entry;
1314		1314
1315	static void prom_query_opal(void)	1315	static void __init prom_query_opal(void)
1316	{	1316	{
1317	long rc;	1317	long rc;
1318		1318
@@ -1436,7 +1436,7 @@ static void __init prom_opal_hold_cpus(void) · 117 unmodified lines
1436	prom_debug("prom_opal_hold_cpus: end...\n");	1436	prom_debug("prom_opal_hold_cpus: end...\n");
1437	}	1437	}
1438		1438
1439	static void prom_opal_takeover(void)	1439	static void __init prom_opal_takeover(void)
1440	{	1440	{
1441	struct opal_secondary_data *data = &RELOC(opal_secondary_data);	1441	struct opal_secondary_data *data = &RELOC(opal_secondary_data);
1442	struct opal_takeover_args *args = &data->args;	1442	struct opal_takeover_args *args = &data->args;

arch/powerpc/mm/numa.c+1−1

@@ -635,7 +635,7 @@ static inline int __init read_usm_ranges(const u32 **usm) · 634 unmodified lines
635	*/	635	*/
636	static void __init parse_drconf_memory(struct device_node *memory)	636	static void __init parse_drconf_memory(struct device_node *memory)
637	{	637	{
638	const u32 dm, usm;	638	const u32 uninitialized_var(dm), usm;
639	unsigned int n, rc, ranges, is_kexec_kdump = 0;	639	unsigned int n, rc, ranges, is_kexec_kdump = 0;
640	unsigned long lmb_size, base, size, sz;	640	unsigned long lmb_size, base, size, sz;
641	int nid;	641	int nid;

arch/powerpc/net/bpf_jit_64.S+2−0

 	mr	r4, r_addr;					\
 	li	r6, SIZE;					\
 	bl	skb_copy_bits;					\
+	nop;							\
 	/* R3 = 0 on success */					\
 	addi	r1, r1, BPF_PPC_SLOWPATH_FRAME;			\
 	ld	r0, 16(r1);					\
 	mr	r4, r_addr;					\
 	li	r5, SIZE;					\
 	bl	bpf_internal_load_pointer_neg_helper;		\
+	nop;							\
 	/* R3 != 0 on success */				\
 	addi	r1, r1, BPF_PPC_SLOWPATH_FRAME;			\
 	ld	r0, 16(r1);					\

arch/powerpc/platforms/pseries/iommu.c+2−2

@@ -106,7 +106,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index, · 105 unmodified lines
106	tcep++;	106	tcep++;
107	}	107	}
108		108
109	if (tbl->it_type == TCE_PCI_SWINV_CREATE)	109	if (tbl->it_type & TCE_PCI_SWINV_CREATE)
110	tce_invalidate_pSeries_sw(tbl, tces, tcep - 1);	110	tce_invalidate_pSeries_sw(tbl, tces, tcep - 1);
111	return 0;	111	return 0;
112	}	112	}
@@ -121,7 +121,7 @@ static void tce_free_pSeries(struct iommu_table *tbl, long index, long npages) · 8 unmodified lines
121	while (npages--)	121	while (npages--)
122	*(tcep++) = 0;	122	*(tcep++) = 0;
123		123
124	if (tbl->it_type == TCE_PCI_SWINV_FREE)	124	if (tbl->it_type & TCE_PCI_SWINV_FREE)
125	tce_invalidate_pSeries_sw(tbl, tces, tcep - 1);	125	tce_invalidate_pSeries_sw(tbl, tces, tcep - 1);
126	}	126	}
127		127

arch/powerpc/platforms/pseries/processor_idle.c+1−1

@@ -106,7 +106,7 @@ static void check_and_cede_processor(void) · 105 unmodified lines
106	* we first hard disable then check.	106	* we first hard disable then check.
107	*/	107	*/
108	hard_irq_disable();	108	hard_irq_disable();
109	if (get_paca()->irq_happened == 0)	109	if (!lazy_irq_pending())
110	cede_processor();	110	cede_processor();
111	}	111	}
112		112

arch/sh/boards/mach-kfr2r09/setup.c+2−2

@@ -201,8 +201,8 @@ static struct resource kfr2r09_usb0_gadget_resources[] = { · 200 unmodified lines
201	.flags = IORESOURCE_MEM,	201	.flags = IORESOURCE_MEM,
202	},	202	},
203	[1] = {	203	[1] = {
204	.start = evtirq(0xa20),	204	.start = evt2irq(0xa20),
205	.end = evtirq(0xa20),	205	.end = evt2irq(0xa20),
206	.flags = IORESOURCE_IRQ \| IRQF_TRIGGER_LOW,	206	.flags = IORESOURCE_IRQ \| IRQF_TRIGGER_LOW,
207	},	207	},
208	};	208	};

arch/sh/drivers/pci/pcie-sh7786.c+1−1

@@ -239,7 +239,7 @@ static int __init pcie_clk_init(struct sh7786_pcie_port *port) · 238 unmodified lines
239	clk->enable_reg = (void __iomem *)(chan->reg_base + SH4A_PCIEPHYCTLR);	239	clk->enable_reg = (void __iomem *)(chan->reg_base + SH4A_PCIEPHYCTLR);
240	clk->enable_bit = BITS_CKE;	240	clk->enable_bit = BITS_CKE;
241		241
242	ret = sh_clk_mstp32_register(clk, 1);	242	ret = sh_clk_mstp_register(clk, 1);
243	if (unlikely(ret < 0))	243	if (unlikely(ret < 0))
244	goto err_phy;	244	goto err_phy;
245		245

arch/sh/kernel/cpu/sh4a/clock-sh7343.c+1−1

@@ -283,7 +283,7 @@ int __init arch_clk_init(void) · 282 unmodified lines
283	ret = sh_clk_div6_register(div6_clks, DIV6_NR);	283	ret = sh_clk_div6_register(div6_clks, DIV6_NR);
284		284
285	if (!ret)	285	if (!ret)
286	ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);	286	ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
287		287
288	return ret;	288	return ret;
289	}	289	}

arch/sh/kernel/cpu/sh4a/clock-sh7366.c+1−1

@@ -276,7 +276,7 @@ int __init arch_clk_init(void) · 275 unmodified lines
276	ret = sh_clk_div6_register(div6_clks, DIV6_NR);	276	ret = sh_clk_div6_register(div6_clks, DIV6_NR);
277		277
278	if (!ret)	278	if (!ret)
279	ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);	279	ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
280		280
281	return ret;	281	return ret;
282	}	282	}

arch/sh/kernel/cpu/sh4a/clock-sh7722.c+1−1

@@ -261,7 +261,7 @@ int __init arch_clk_init(void) · 260 unmodified lines
261	ret = sh_clk_div6_register(div6_clks, DIV6_NR);	261	ret = sh_clk_div6_register(div6_clks, DIV6_NR);
262		262
263	if (!ret)	263	if (!ret)
264	ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);	264	ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
265		265
266	return ret;	266	return ret;
267	}	267	}

arch/sh/kernel/cpu/sh4a/clock-sh7723.c+1−1

@@ -311,7 +311,7 @@ int __init arch_clk_init(void) · 310 unmodified lines
311	ret = sh_clk_div6_register(div6_clks, DIV6_NR);	311	ret = sh_clk_div6_register(div6_clks, DIV6_NR);
312		312
313	if (!ret)	313	if (!ret)
314	ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);	314	ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
315		315
316	return ret;	316	return ret;
317	}	317	}

arch/sh/kernel/cpu/sh4a/clock-sh7724.c+1−1

@@ -375,7 +375,7 @@ int __init arch_clk_init(void) · 374 unmodified lines
375	ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR);	375	ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR);
376		376
377	if (!ret)	377	if (!ret)
378	ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);	378	ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
379		379
380	return ret;	380	return ret;
381	}	381	}

arch/sh/kernel/cpu/sh4a/clock-sh7734.c+1−1

@@ -260,7 +260,7 @@ int __init arch_clk_init(void) · 259 unmodified lines
260	&div4_table);	260	&div4_table);
261		261
262	if (!ret)	262	if (!ret)
263	ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);	263	ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
264		264
265	return ret;	265	return ret;
266	}	266	}

arch/sh/kernel/cpu/sh4a/clock-sh7757.c+1−1

@@ -148,7 +148,7 @@ int __init arch_clk_init(void) · 147 unmodified lines
148	ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),	148	ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
149	&div4_table);	149	&div4_table);
150	if (!ret)	150	if (!ret)
151	ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);	151	ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
152		152
153	return ret;	153	return ret;
154	}	154	}

arch/sh/kernel/cpu/sh4a/clock-sh7785.c+1−1

@@ -175,7 +175,7 @@ int __init arch_clk_init(void) · 174 unmodified lines
175	ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),	175	ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
176	&div4_table);	176	&div4_table);
177	if (!ret)	177	if (!ret)
178	ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);	178	ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
179		179
180	return ret;	180	return ret;
181	}	181	}

arch/sh/kernel/cpu/sh4a/clock-sh7786.c+1−1

@@ -194,7 +194,7 @@ int __init arch_clk_init(void) · 193 unmodified lines
194	ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),	194	ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
195	&div4_table);	195	&div4_table);
196	if (!ret)	196	if (!ret)
197	ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);	197	ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
198		198
199	return ret;	199	return ret;
200	}	200	}

arch/sh/kernel/cpu/sh4a/clock-shx3.c+1−1

@@ -149,7 +149,7 @@ int __init arch_clk_init(void) · 148 unmodified lines
149	ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),	149	ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
150	&div4_table);	150	&div4_table);
151	if (!ret)	151	if (!ret)
152	ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);	152	ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
153		153
154	return ret;	154	return ret;
155	}	155	}

arch/x86/ia32/ia32_signal.c+1−1

@@ -38,7 +38,7 @@ · 37 unmodified lines
38	int copy_siginfo_to_user32(compat_siginfo_t __user to, siginfo_t from)	38	int copy_siginfo_to_user32(compat_siginfo_t __user to, siginfo_t from)
39	{	39	{
40	int err = 0;	40	int err = 0;
41	bool ia32 = is_ia32_task();	41	bool ia32 = test_thread_flag(TIF_IA32);
42		42
43	if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t)))	43	if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t)))
44	return -EFAULT;	44	return -EFAULT;

arch/x86/include/asm/cpufeature.h+1−1

@@ -176,7 +176,7 @@ · 175 unmodified lines
176	#define X86_FEATURE_XSAVEOPT (732+ 4) / Optimized Xsave */	176	#define X86_FEATURE_XSAVEOPT (732+ 4) / Optimized Xsave */
177	#define X86_FEATURE_PLN (732+ 5) / Intel Power Limit Notification */	177	#define X86_FEATURE_PLN (732+ 5) / Intel Power Limit Notification */
178	#define X86_FEATURE_PTS (732+ 6) / Intel Package Thermal Status */	178	#define X86_FEATURE_PTS (732+ 6) / Intel Package Thermal Status */
179	#define X86_FEATURE_DTS (732+ 7) / Digital Thermal Sensor */	179	#define X86_FEATURE_DTHERM (732+ 7) / Digital Thermal Sensor */
180	#define X86_FEATURE_HW_PSTATE (732+ 8) / AMD HW-PState */	180	#define X86_FEATURE_HW_PSTATE (732+ 8) / AMD HW-PState */
181		181
182	/* Virtualization flags: Linux defined, word 8 */	182	/* Virtualization flags: Linux defined, word 8 */

arch/x86/kernel/acpi/boot.c+16−11

@@ -422,12 +422,14 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header, · 421 unmodified lines
422	return 0;	422	return 0;
423	}	423	}
424		424
425	if (intsrc->source_irq == 0 && intsrc->global_irq == 2) {	425	if (intsrc->source_irq == 0) {
426	if (acpi_skip_timer_override) {	426	if (acpi_skip_timer_override) {
427	printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n");	427	printk(PREFIX "BIOS IRQ0 override ignored.\n");
428	return 0;	428	return 0;
429	}	429	}
430	if (acpi_fix_pin2_polarity && (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) {	430
		431	if ((intsrc->global_irq == 2) && acpi_fix_pin2_polarity
		432	&& (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) {
431	intsrc->inti_flags &= ~ACPI_MADT_POLARITY_MASK;	433	intsrc->inti_flags &= ~ACPI_MADT_POLARITY_MASK;
432	printk(PREFIX "BIOS IRQ0 pin2 override: forcing polarity to high active.\n");	434	printk(PREFIX "BIOS IRQ0 pin2 override: forcing polarity to high active.\n");
433	}	435	}
@@ -1334,17 +1336,12 @@ static int __init dmi_disable_acpi(const struct dmi_system_id *d) · 900 unmodified lines
1334	}	1336	}
1335		1337
1336	/*	1338	/*
1337	* Force ignoring BIOS IRQ0 pin2 override	1339	* Force ignoring BIOS IRQ0 override
1338	*/	1340	*/
1339	static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)	1341	static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
1340	{	1342	{
1341	/*
1342	* The ati_ixp4x0_rev() early PCI quirk should have set
1343	* the acpi_skip_timer_override flag already:
1344	*/
1345	if (!acpi_skip_timer_override) {	1343	if (!acpi_skip_timer_override) {
1346	WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n");	1344	pr_notice("%s detected: Ignoring BIOS IRQ0 override\n",
1347	pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n",
1348	d->ident);	1345	d->ident);
1349	acpi_skip_timer_override = 1;	1346	acpi_skip_timer_override = 1;
1350	}	1347	}
@@ -1438,7 +1435,7 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = { · 87 unmodified lines
1438	* is enabled. This input is incorrectly designated the	1435	* is enabled. This input is incorrectly designated the
1439	* ISA IRQ 0 via an interrupt source override even though	1436	* ISA IRQ 0 via an interrupt source override even though
1440	* it is wired to the output of the master 8259A and INTIN0	1437	* it is wired to the output of the master 8259A and INTIN0
1441	* is not connected at all. Force ignoring BIOS IRQ0 pin2	1438	* is not connected at all. Force ignoring BIOS IRQ0
1442	* override in that cases.	1439	* override in that cases.
1443	*/	1440	*/
1444	{	1441	{
@@ -1473,6 +1470,14 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = { · 28 unmodified lines
1473	DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),	1470	DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
1474	},	1471	},
1475	},	1472	},
		1473	{
		1474	.callback = dmi_ignore_irq0_timer_override,
		1475	.ident = "FUJITSU SIEMENS",
		1476	.matches = {
		1477	DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
		1478	DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"),
		1479	},
		1480	},
1476	{}	1481	{}
1477	};	1482	};
1478		1483

arch/x86/kernel/cpu/mkcapflags.pl+19−6

@@ -1,4 +1,4 @@
1	#!/usr/bin/perl	1	#!/usr/bin/perl -w
2	#	2	#
3	# Generate the x86_cap_flags[] array from include/asm-x86/cpufeature.h	3	# Generate the x86_cap_flags[] array from include/asm-x86/cpufeature.h
4	#	4	#
@@ -11,22 +11,35 @@ open(OUT, "> $out\0") or die "$0: cannot create: $out: $!\n"; · 6 unmodified lines
11	print OUT "#include <asm/cpufeature.h>\n\n";	11	print OUT "#include <asm/cpufeature.h>\n\n";
12	print OUT "const char * const x86_cap_flags[NCAPINTS*32] = {\n";	12	print OUT "const char * const x86_cap_flags[NCAPINTS*32] = {\n";
13		13
		14	%features = ();
		15	$err = 0;
		16
14	while (defined($line = <IN>)) {	17	while (defined($line = <IN>)) {
15	if ($line =~ /^\s\#\sdefine\s+(X86_FEATURE_(\S+))\s+(.*)$/) {	18	if ($line =~ /^\s\#\sdefine\s+(X86_FEATURE_(\S+))\s+(.*)$/) {
16	$macro = $1;	19	$macro = $1;
17	$feature = $2;	20	$feature = "\L$2";
18	$tail = $3;	21	$tail = $3;
19	if ($tail =~ /\/\\s\"([^"])\".\*\//) {	22	if ($tail =~ /\/\\s\"([^"])\".\*\//) {
20	$feature = $1;	23	$feature = "\L$1";
21	}	24	}
22		25
23	if ($feature ne '') {	26	next if ($feature eq '');
24	printf OUT "\t%-32s = \"%s\",\n",	27
25	"[$macro]", "\L$feature";	28	if ($features{$feature}++) {
		29	print STDERR "$in: duplicate feature name: $feature\n";
		30	$err++;
26	}	31	}
		32	printf OUT "\t%-32s = \"%s\",\n", "[$macro]", $feature;
27	}	33	}
28	}	34	}
29	print OUT "};\n";	35	print OUT "};\n";
30		36
31	close(IN);	37	close(IN);
32	close(OUT);	38	close(OUT);
		39
		40	if ($err) {
		41	unlink($out);
		42	exit(1);
		43	}
		44
		45	exit(0);

arch/x86/kernel/cpu/scattered.c+1−1

@@ -31,7 +31,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) · 30 unmodified lines
31	const struct cpuid_bit *cb;	31	const struct cpuid_bit *cb;
32		32
33	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {	33	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {
34	{ X86_FEATURE_DTS, CR_EAX, 0, 0x00000006, 0 },	34	{ X86_FEATURE_DTHERM, CR_EAX, 0, 0x00000006, 0 },
35	{ X86_FEATURE_IDA, CR_EAX, 1, 0x00000006, 0 },	35	{ X86_FEATURE_IDA, CR_EAX, 1, 0x00000006, 0 },
36	{ X86_FEATURE_ARAT, CR_EAX, 2, 0x00000006, 0 },	36	{ X86_FEATURE_ARAT, CR_EAX, 2, 0x00000006, 0 },
37	{ X86_FEATURE_PLN, CR_EAX, 4, 0x00000006, 0 },	37	{ X86_FEATURE_PLN, CR_EAX, 4, 0x00000006, 0 },

arch/x86/kernel/kgdb.c+4−4

@@ -444,12 +444,12 @@ void kgdb_roundup_cpus(unsigned long flags) · 443 unmodified lines
444		444
445	/**	445	/**
446	* kgdb_arch_handle_exception - Handle architecture specific GDB packets.	446	* kgdb_arch_handle_exception - Handle architecture specific GDB packets.
447	* @vector: The error vector of the exception that happened.	447	* @e_vector: The error vector of the exception that happened.
448	* @signo: The signal number of the exception that happened.	448	* @signo: The signal number of the exception that happened.
449	* @err_code: The error code of the exception that happened.	449	* @err_code: The error code of the exception that happened.
450	* @remcom_in_buffer: The buffer of the packet we have read.	450	* @remcomInBuffer: The buffer of the packet we have read.
451	* @remcom_out_buffer: The buffer of %BUFMAX bytes to write a packet into.	451	* @remcomOutBuffer: The buffer of %BUFMAX bytes to write a packet into.
452	* @regs: The &struct pt_regs of the current process.	452	* @linux_regs: The &struct pt_regs of the current process.
453	*	453	*
454	* This function MUST handle the 'c' and 's' command packets,	454	* This function MUST handle the 'c' and 's' command packets,
455	* as well packets to set / remove a hardware breakpoint, if used.	455	* as well packets to set / remove a hardware breakpoint, if used.

arch/x86/kernel/reboot.c+8−0

@@ -451,6 +451,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { · 450 unmodified lines
451	DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),	451	DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
452	},	452	},
453	},	453	},
		454	{ /* Handle problems with rebooting on the Precision M6600. */
		455	.callback = set_pci_reboot,
		456	.ident = "Dell OptiPlex 990",
		457	.matches = {
		458	DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		459	DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
		460	},
		461	},
454	{ }	462	{ }
455	};	463	};
456		464

arch/x86/lib/csum-wrappers_64.c+1−1

@@ -115,7 +115,7 @@ EXPORT_SYMBOL(csum_partial_copy_to_user); · 114 unmodified lines
115	* @src: source address	115	* @src: source address
116	* @dst: destination address	116	* @dst: destination address
117	* @len: number of bytes to be copied.	117	* @len: number of bytes to be copied.
118	* @isum: initial sum that is added into the result (32bit unfolded)	118	* @sum: initial sum that is added into the result (32bit unfolded)
119	*	119	*
120	* Returns an 32bit unfolded checksum of the buffer.	120	* Returns an 32bit unfolded checksum of the buffer.
121	*/	121	*/

drivers/acpi/acpi_pad.c+4−3

 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
 static DEFINE_MUTEX(isolated_cpus_lock);
+static DEFINE_MUTEX(round_robin_lock);
 static unsigned long power_saving_mwait_eax;
 	if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
 		return;
-	mutex_lock(&isolated_cpus_lock);
+	mutex_lock(&round_robin_lock);
 	cpumask_clear(tmp);
 	for_each_cpu(cpu, pad_busy_cpus)
 		cpumask_or(tmp, tmp, topology_thread_cpumask(cpu));
 	if (cpumask_empty(tmp))
 		cpumask_andnot(tmp, cpu_online_mask, pad_busy_cpus);
 	if (cpumask_empty(tmp)) {
-		mutex_unlock(&isolated_cpus_lock);
+		mutex_unlock(&round_robin_lock);
 		return;
 	}
 	for_each_cpu(cpu, tmp) {
 	tsk_in_cpu[tsk_index] = preferred_cpu;
 	cpumask_set_cpu(preferred_cpu, pad_busy_cpus);
 	cpu_weight[preferred_cpu]++;
-	mutex_unlock(&isolated_cpus_lock);
+	mutex_unlock(&round_robin_lock);
 	set_cpus_allowed_ptr(current, cpumask_of(preferred_cpu));
 }

drivers/acpi/apei/apei-base.c+15−2

 	u8 ins = entry->instruction;
 	if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
-		return acpi_os_map_generic_address(&entry->register_region);
+		return apei_map_generic_address(&entry->register_region);
 	return 0;
 }
 	u8 ins = entry->instruction;
 	if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
-		acpi_os_unmap_generic_address(&entry->register_region);
+		apei_unmap_generic_address(&entry->register_region);
 	return 0;
 }
 	return 0;
 }
+int apei_map_generic_address(struct acpi_generic_address *reg)
+{
+	int rc;
+	u32 access_bit_width;
+	u64 address;
+	rc = apei_check_gar(reg, &address, &access_bit_width);
+	if (rc)
+		return rc;
+	return acpi_os_map_generic_address(reg);
+}
+EXPORT_SYMBOL_GPL(apei_map_generic_address);
 /* read GAR in interrupt (including NMI) or process context */
 int apei_read(u64 *val, struct acpi_generic_address *reg)
 {

drivers/acpi/apei/apei-internal.h+9−0

 #define APEI_INTERNAL_H
 #include <linux/cper.h>
+#include <linux/acpi.h>
+#include <linux/acpi_io.h>
 struct apei_exec_context;
 /* IP has been set in instruction function */
 #define APEI_EXEC_SET_IP	1
+int apei_map_generic_address(struct acpi_generic_address *reg);
+static inline void apei_unmap_generic_address(struct acpi_generic_address *reg)
+{
+	acpi_os_unmap_generic_address(reg);
+}
 int apei_read(u64 *val, struct acpi_generic_address *reg);
 int apei_write(u64 val, struct acpi_generic_address *reg);

drivers/acpi/apei/ghes.c+3−3

@@ -301,7 +301,7 @@ static struct ghes ghes_new(struct acpi_hest_generic generic) · 300 unmodified lines
301	if (!ghes)	301	if (!ghes)
302	return ERR_PTR(-ENOMEM);	302	return ERR_PTR(-ENOMEM);
303	ghes->generic = generic;	303	ghes->generic = generic;
304	rc = acpi_os_map_generic_address(&generic->error_status_address);	304	rc = apei_map_generic_address(&generic->error_status_address);
305	if (rc)	305	if (rc)
306	goto err_free;	306	goto err_free;
307	error_block_length = generic->error_block_length;	307	error_block_length = generic->error_block_length;
@@ -321,7 +321,7 @@ static struct ghes ghes_new(struct acpi_hest_generic generic) · 13 unmodified lines
321	return ghes;	321	return ghes;
322		322
323	err_unmap:	323	err_unmap:
324	acpi_os_unmap_generic_address(&generic->error_status_address);	324	apei_unmap_generic_address(&generic->error_status_address);
325	err_free:	325	err_free:
326	kfree(ghes);	326	kfree(ghes);
327	return ERR_PTR(rc);	327	return ERR_PTR(rc);
@@ -330,7 +330,7 @@ err_free: · 2 unmodified lines
330	static void ghes_fini(struct ghes *ghes)	330	static void ghes_fini(struct ghes *ghes)
331	{	331	{
332	kfree(ghes->estatus);	332	kfree(ghes->estatus);
333	acpi_os_unmap_generic_address(&ghes->generic->error_status_address);	333	apei_unmap_generic_address(&ghes->generic->error_status_address);
334	}	334	}
335		335
336	enum {	336	enum {

drivers/acpi/processor_idle.c+30−2

 /*
  * Suspend / resume control
  */
+static int acpi_idle_suspend;
 static u32 saved_bm_rld;
 static void acpi_idle_bm_rld_save(void)
 int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
 {
+	if (acpi_idle_suspend == 1)
+		return 0;
 	acpi_idle_bm_rld_save();
+	acpi_idle_suspend = 1;
 	return 0;
 }
 int acpi_processor_resume(struct acpi_device * device)
 {
+	if (acpi_idle_suspend == 0)
+		return 0;
 	acpi_idle_bm_rld_restore();
+	acpi_idle_suspend = 0;
 	return 0;
 }
 	local_irq_disable();
+	if (acpi_idle_suspend) {
+		local_irq_enable();
+		cpu_relax();
+		return -EBUSY;
+	}
 	lapic_timer_state_broadcast(pr, cx, 1);
 	kt1 = ktime_get_real();
 	acpi_idle_do_entry(cx);
 	local_irq_disable();
+	if (acpi_idle_suspend) {
+		local_irq_enable();
+		cpu_relax();
+		return -EBUSY;
+	}
 	if (cx->entry_method != ACPI_CSTATE_FFH) {
 		current_thread_info()->status &= ~TS_POLLING;
 		/*
 						drv, drv->safe_state_index);
 		} else {
 			local_irq_disable();
-			acpi_safe_halt();
+			if (!acpi_idle_suspend)
+				acpi_safe_halt();
 			local_irq_enable();
-			return -EINVAL;
+			return -EBUSY;
 		}
 	}
 	local_irq_disable();
+	if (acpi_idle_suspend) {
+		local_irq_enable();
+		cpu_relax();
+		return -EBUSY;
+	}
 	if (cx->entry_method != ACPI_CSTATE_FFH) {
 		current_thread_info()->status &= ~TS_POLLING;
 		/*

drivers/acpi/sysfs.c+2−2

@@ -173,7 +173,7 @@ static int param_set_trace_state(const char val, struct kernel_param kp) · 172 unmodified lines
173	{	173	{
174	int result = 0;	174	int result = 0;
175		175
176	if (!strncmp(val, "enable", strlen("enable") - 1)) {	176	if (!strncmp(val, "enable", strlen("enable"))) {
177	result = acpi_debug_trace(trace_method_name, trace_debug_level,	177	result = acpi_debug_trace(trace_method_name, trace_debug_level,
178	trace_debug_layer, 0);	178	trace_debug_layer, 0);
179	if (result)	179	if (result)
@@ -181,7 +181,7 @@ static int param_set_trace_state(const char val, struct kernel_param kp) · 1 unmodified line
181	goto exit;	181	goto exit;
182	}	182	}
183		183
184	if (!strncmp(val, "disable", strlen("disable") - 1)) {	184	if (!strncmp(val, "disable", strlen("disable"))) {
185	int name = 0;	185	int name = 0;
186	result = acpi_debug_trace((char *)&name, trace_debug_level,	186	result = acpi_debug_trace((char *)&name, trace_debug_level,
187	trace_debug_layer, 0);	187	trace_debug_layer, 0);

drivers/acpi/video.c+2−0

@@ -558,6 +558,8 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag) · 557 unmodified lines
558	union acpi_object arg0 = { ACPI_TYPE_INTEGER };	558	union acpi_object arg0 = { ACPI_TYPE_INTEGER };
559	struct acpi_object_list args = { 1, &arg0 };	559	struct acpi_object_list args = { 1, &arg0 };
560		560
		561	if (!video->cap._DOS)
		562	return 0;
561		563
562	if (bios_flag < 0 \|\| bios_flag > 3 \|\| lcd_flag < 0 \|\| lcd_flag > 1)	564	if (bios_flag < 0 \|\| bios_flag > 3 \|\| lcd_flag < 0 \|\| lcd_flag > 1)
563	return -EINVAL;	565	return -EINVAL;

drivers/base/power/main.c+4−2

 	dpm_wait_for_children(dev, async);
 	if (async_error)
-		return 0;
+		goto Complete;
 	pm_runtime_get_noresume(dev);
 	if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
 	if (pm_wakeup_pending()) {
 		pm_runtime_put_sync(dev);
 		async_error = -EBUSY;
-		return 0;
+		goto Complete;
 	}
 	device_lock(dev);
 	}
 	device_unlock(dev);
+ Complete:
 	complete_all(&dev->power.completion);
 	if (error) {

drivers/bluetooth/ath3k.c+3−0

 	/* Atheros AR3011 with sflash firmware*/
 	{ USB_DEVICE(0x0CF3, 0x3002) },
+	{ USB_DEVICE(0x0CF3, 0xE019) },
 	{ USB_DEVICE(0x13d3, 0x3304) },
 	{ USB_DEVICE(0x0930, 0x0215) },
 	{ USB_DEVICE(0x0489, 0xE03D) },
 	{ USB_DEVICE(0x04CA, 0x3005) },
 	{ USB_DEVICE(0x13d3, 0x3362) },
 	{ USB_DEVICE(0x0CF3, 0xE004) },
+	{ USB_DEVICE(0x0930, 0x0219) },
 	/* Atheros AR5BBU12 with sflash firmware */
 	{ USB_DEVICE(0x0489, 0xE02C) },
 	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
+	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
 	/* Atheros AR5BBU22 with sflash firmware */
 	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btmrvl_drv.h+1−1

@@ -136,7 +136,7 @@ int btmrvl_remove_card(struct btmrvl_private *priv); · 135 unmodified lines
136		136
137	void btmrvl_interrupt(struct btmrvl_private *priv);	137	void btmrvl_interrupt(struct btmrvl_private *priv);
138		138
139	void btmrvl_check_evtpkt(struct btmrvl_private priv, struct sk_buff skb);	139	bool btmrvl_check_evtpkt(struct btmrvl_private priv, struct sk_buff skb);
140	int btmrvl_process_event(struct btmrvl_private priv, struct sk_buff skb);	140	int btmrvl_process_event(struct btmrvl_private priv, struct sk_buff skb);
141		141
142	int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);	142	int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);

drivers/bluetooth/btmrvl_main.c+12−2

 }
 EXPORT_SYMBOL_GPL(btmrvl_interrupt);
-void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
+bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
 {
 	struct hci_event_hdr *hdr = (void *) skb->data;
 	struct hci_ev_cmd_complete *ec;
-	u16 opcode, ocf;
+	u16 opcode, ocf, ogf;
 	if (hdr->evt == HCI_EV_CMD_COMPLETE) {
 		ec = (void *) (skb->data + HCI_EVENT_HDR_SIZE);
 		opcode = __le16_to_cpu(ec->opcode);
 		ocf = hci_opcode_ocf(opcode);
+		ogf = hci_opcode_ogf(opcode);
 		if (ocf == BT_CMD_MODULE_CFG_REQ &&
 					priv->btmrvl_dev.sendcmdflag) {
 			priv->btmrvl_dev.sendcmdflag = false;
 			priv->adapter->cmd_complete = true;
 			wake_up_interruptible(&priv->adapter->cmd_wait_q);
 		}
+		if (ogf == OGF) {
+			BT_DBG("vendor event skipped: ogf 0x%4.4x", ogf);
+			kfree_skb(skb);
+			return false;
+		}
 	}
+	return true;
 }
 EXPORT_SYMBOL_GPL(btmrvl_check_evtpkt);

drivers/bluetooth/btmrvl_sdio.c+5−3

 		skb_put(skb, buf_len);
 		skb_pull(skb, SDIO_HEADER_LEN);
-		if (type == HCI_EVENT_PKT)
+		if (type == HCI_EVENT_PKT) {
-			btmrvl_check_evtpkt(priv, skb);
+			if (btmrvl_check_evtpkt(priv, skb))
+				hci_recv_frame(skb);
+		} else
+			hci_recv_frame(skb);
-		hci_recv_frame(skb);
 		hdev->stat.byte_rx += buf_len;
 		break;

drivers/bluetooth/btusb.c+2−0

 	/* Atheros 3011 with sflash firmware */
 	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
+	{ USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE },
 	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
 	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
 	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
 	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
+	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
 	/* Atheros AR5BBU12 with sflash firmware */
 	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },

drivers/clk/clk.c+17−9

 {
 	struct clk *child;
 	unsigned long old_rate;
+	unsigned long best_parent_rate = 0;
 	struct hlist_node *tmp;
 	old_rate = clk->rate;
+	if (clk->parent)
+		best_parent_rate = clk->parent->rate;
 	if (clk->ops->set_rate)
-		clk->ops->set_rate(clk->hw, clk->new_rate, clk->parent->rate);
+		clk->ops->set_rate(clk->hw, clk->new_rate, best_parent_rate);
 	if (clk->ops->recalc_rate)
-		clk->rate = clk->ops->recalc_rate(clk->hw,
+		clk->rate = clk->ops->recalc_rate(clk->hw, best_parent_rate);
-				clk->parent->rate);
 	else
-		clk->rate = clk->parent->rate;
+		clk->rate = best_parent_rate;
 	if (clk->notifier_count && old_rate != clk->rate)
 		__clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate);
 	if (!clk->parents)
 		clk->parents =
-			kmalloc((sizeof(struct clk*) * clk->num_parents),
+			kzalloc((sizeof(struct clk*) * clk->num_parents),
 					GFP_KERNEL);
 	if (!clk->parents)
 	old_parent = clk->parent;
 	/* find index of new parent clock using cached parent ptrs */
-	for (i = 0; i < clk->num_parents; i++)
+	if (clk->parents)
-		if (clk->parents[i] == parent)
+		for (i = 0; i < clk->num_parents; i++)
-			break;
+			if (clk->parents[i] == parent)
+				break;
+	else
+		clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
+								GFP_KERNEL);
 	/*
 	 * find index of new parent clock using string name comparison
 	if (i == clk->num_parents)
 		for (i = 0; i < clk->num_parents; i++)
 			if (!strcmp(clk->parent_names[i], parent->name)) {
-				clk->parents[i] = __clk_lookup(parent->name);
+				if (clk->parents)
+					clk->parents[i] = __clk_lookup(parent->name);
 				break;
 			}

drivers/clk/mxs/clk-imx23.c+6−6

drivers/clk/mxs/clk-imx28.c+16−16

drivers/clk/spear/spear6xx_clock.c+1−1

@@ -298,7 +298,7 @@ void __init spear6xx_clk_init(void) · 297 unmodified lines
298		298
299	clk = clk_register_gate(NULL, "gmac_clk", "ahb_clk", 0, PERIP1_CLK_ENB,	299	clk = clk_register_gate(NULL, "gmac_clk", "ahb_clk", 0, PERIP1_CLK_ENB,
300	GMAC_CLK_ENB, 0, &_lock);	300	GMAC_CLK_ENB, 0, &_lock);
301	clk_register_clkdev(clk, NULL, "gmac");	301	clk_register_clkdev(clk, NULL, "e0800000.ethernet");
302		302
303	clk = clk_register_gate(NULL, "i2c_clk", "ahb_clk", 0, PERIP1_CLK_ENB,	303	clk = clk_register_gate(NULL, "i2c_clk", "ahb_clk", 0, PERIP1_CLK_ENB,
304	I2C_CLK_ENB, 0, &_lock);	304	I2C_CLK_ENB, 0, &_lock);

drivers/gpu/drm/i915/i915_irq.c+0−1

@@ -412,7 +412,6 @@ static void gen6_queue_rps_work(struct drm_i915_private *dev_priv, · 411 unmodified lines
412	*/	412	*/
413		413
414	spin_lock_irqsave(&dev_priv->rps_lock, flags);	414	spin_lock_irqsave(&dev_priv->rps_lock, flags);
415	WARN(dev_priv->pm_iir & pm_iir, "Missed a PM interrupt\n");
416	dev_priv->pm_iir \|= pm_iir;	415	dev_priv->pm_iir \|= pm_iir;
417	I915_WRITE(GEN6_PMIMR, dev_priv->pm_iir);	416	I915_WRITE(GEN6_PMIMR, dev_priv->pm_iir);
418	POSTING_READ(GEN6_PMIMR);	417	POSTING_READ(GEN6_PMIMR);

drivers/gpu/drm/i915/i915_suspend.c+4−1

 	if (HAS_PCH_SPLIT(dev)) {
 		I915_WRITE(BLC_PWM_PCH_CTL1, dev_priv->saveBLC_PWM_CTL);
 		I915_WRITE(BLC_PWM_PCH_CTL2, dev_priv->saveBLC_PWM_CTL2);
-		I915_WRITE(BLC_PWM_CPU_CTL, dev_priv->saveBLC_CPU_PWM_CTL);
+		/* NOTE: BLC_PWM_CPU_CTL must be written after BLC_PWM_CPU_CTL2;
+		 * otherwise we get blank eDP screen after S3 on some machines
+		 */
 		I915_WRITE(BLC_PWM_CPU_CTL2, dev_priv->saveBLC_CPU_PWM_CTL2);
+		I915_WRITE(BLC_PWM_CPU_CTL, dev_priv->saveBLC_CPU_PWM_CTL);
 		I915_WRITE(PCH_PP_ON_DELAYS, dev_priv->savePP_ON_DELAYS);
 		I915_WRITE(PCH_PP_OFF_DELAYS, dev_priv->savePP_OFF_DELAYS);
 		I915_WRITE(PCH_PP_DIVISOR, dev_priv->savePP_DIVISOR);

drivers/gpu/drm/i915/intel_display.c+0−16

@@ -6921,19 +6921,6 @@ static void i915_disable_vga(struct drm_device *dev) · 6920 unmodified lines
6921	POSTING_READ(vga_reg);	6921	POSTING_READ(vga_reg);
6922	}	6922	}
6923		6923
6924	static void ivb_pch_pwm_override(struct drm_device *dev)
6925	{
6926	struct drm_i915_private *dev_priv = dev->dev_private;
6927
6928	/*
6929	* IVB has CPU eDP backlight regs too, set things up to let the
6930	* PCH regs control the backlight
6931	*/
6932	I915_WRITE(BLC_PWM_CPU_CTL2, PWM_ENABLE);
6933	I915_WRITE(BLC_PWM_CPU_CTL, 0);
6934	I915_WRITE(BLC_PWM_PCH_CTL1, PWM_ENABLE \| (1<<30));
6935	}
6936
6937	void intel_modeset_init_hw(struct drm_device *dev)	6924	void intel_modeset_init_hw(struct drm_device *dev)
6938	{	6925	{
6939	struct drm_i915_private *dev_priv = dev->dev_private;	6926	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -6950,9 +6937,6 @@ void intel_modeset_init_hw(struct drm_device *dev) · 10 unmodified lines
6950	gen6_enable_rps(dev_priv);	6937	gen6_enable_rps(dev_priv);
6951	gen6_update_ring_freq(dev_priv);	6938	gen6_update_ring_freq(dev_priv);
6952	}	6939	}
6953
6954	if (IS_IVYBRIDGE(dev))
6955	ivb_pch_pwm_override(dev);
6956	}	6940	}
6957		6941
6958	void intel_modeset_init(struct drm_device *dev)	6942	void intel_modeset_init(struct drm_device *dev)

drivers/gpu/drm/nouveau/nouveau_fbcon.c+1−1

@@ -467,7 +467,7 @@ int nouveau_fbcon_init(struct drm_device *dev) · 466 unmodified lines
467	nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs;	467	nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs;
468		468
469	ret = drm_fb_helper_init(dev, &nfbdev->helper,	469	ret = drm_fb_helper_init(dev, &nfbdev->helper,
470	nv_two_heads(dev) ? 2 : 1, 4);	470	dev->mode_config.num_crtc, 4);
471	if (ret) {	471	if (ret) {
472	kfree(nfbdev);	472	kfree(nfbdev);
473	return ret;	473	return ret;

drivers/gpu/drm/nouveau/nouveau_prime.c+23−0

@@ -1,3 +1,26 @@
		1	/*
		2	* Copyright 2011 Red Hat Inc.
		3	*
		4	* Permission is hereby granted, free of charge, to any person obtaining a
		5	* copy of this software and associated documentation files (the "Software"),
		6	* to deal in the Software without restriction, including without limitation
		7	* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		8	* and/or sell copies of the Software, and to permit persons to whom the
		9	* Software is furnished to do so, subject to the following conditions:
		10	*
		11	* The above copyright notice and this permission notice shall be included in
		12	* all copies or substantial portions of the Software.
		13	*
		14	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		15	* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		16	* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		17	* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
		18	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
		19	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		20	* OTHER DEALINGS IN THE SOFTWARE.
		21	*
		22	* Authors: Dave Airlie
		23	*/
1		24
2	#include "drmP.h"	25	#include "drmP.h"
3	#include "drm.h"	26	#include "drm.h"

drivers/gpu/drm/udl/udl_main.c+1−1

@@ -61,7 +61,7 @@ static int udl_parse_vendor_descriptor(struct drm_device *dev, · 60 unmodified lines
61	u8 length;	61	u8 length;
62	u16 key;	62	u16 key;
63		63
64	key = ((u16 ) desc);	64	key = le16_to_cpu(((u16 ) desc));
65	desc += sizeof(u16);	65	desc += sizeof(u16);
66	length = *desc;	66	length = *desc;
67	desc++;	67	desc++;

drivers/hid/Kconfig+20−23

 #
 # HID driver configuration
 #
-menuconfig HID_SUPPORT
+menu "HID support"
-	bool "HID Devices"
+     depends on INPUT
-	depends on INPUT
-	default y
-	---help---
-	  Say Y here to get to see options for various computer-human interface
-	  device drivers. This option alone does not add any kernel code.
-	  If you say N, all options in this submenu will be skipped and disabled.
-if HID_SUPPORT
 config HID
-	tristate "Generic HID support"
+	tristate "HID bus support"
 	depends on INPUT
 	default y
 	---help---
 	  most commonly used to refer to the USB-HID specification, but other
 	  devices (such as, but not strictly limited to, Bluetooth) are
 	  designed using HID specification (this involves certain keyboards,
-	  mice, tablets, etc). This option compiles into kernel the generic
+	  mice, tablets, etc). This option adds the HID bus to the kernel,
-	  HID layer code (parser, usages, etc.), which can then be used by
+	  together with generic HID layer code. The HID devices are added and
-	  transport-specific HID implementation (like USB or Bluetooth).
+	  removed from the HID bus by the transport-layer drivers, such as
+	  usbhid (USB_HID) and hidp (BT_HIDP).
 	  For docs and specs, see http://www.usb.org/developers/hidpage/
 	  If unsure, say Y.
+if HID
 config HID_BATTERY_STRENGTH
 	bool "Battery level reporting for HID devices"
 	depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
 	If unsure, say Y.
-source "drivers/hid/usbhid/Kconfig"
-menu "Special HID drivers"
-	depends on HID
 config HID_GENERIC
 	tristate "Generic HID driver"
 	depends on HID
-	default y
+	default HID
 	---help---
-	Support for generic HID devices.
+	Support for generic devices on the HID bus. This includes most
+	keyboards and mice, joysticks, tablets and digitizers.
 	To compile this driver as a module, choose M here: the module
 	will be called hid-generic.
 	If unsure, say Y.
+menu "Special HID drivers"
+	depends on HID
 config HID_A4TECH
 	tristate "A4 tech mice" if EXPERT
 	depends on USB_HID
 endmenu
-endif # HID_SUPPORT
+endif # HID
+source "drivers/hid/usbhid/Kconfig"
+endmenu

drivers/hid/hid-core.c+1−0

@@ -1880,6 +1880,7 @@ static const struct hid_device_id hid_ignore_list[] = { · 1879 unmodified lines
1880	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},	1880	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},
1881	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},	1881	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},
1882	{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },	1882	{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
		1883	{ HID_USB_DEVICE(USB_VENDOR_ID_AXENTIA, USB_DEVICE_ID_AXENTIA_FM_RADIO) },
1883	{ HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },	1884	{ HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },
1884	{ HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },	1885	{ HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },
1885	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },	1886	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },

drivers/hid/hid-ids.h+3−0

@@ -160,6 +160,9 @@ · 159 unmodified lines
160	#define USB_VENDOR_ID_AVERMEDIA 0x07ca	160	#define USB_VENDOR_ID_AVERMEDIA 0x07ca
161	#define USB_DEVICE_ID_AVER_FM_MR800 0xb800	161	#define USB_DEVICE_ID_AVER_FM_MR800 0xb800
162		162
		163	#define USB_VENDOR_ID_AXENTIA 0x12cf
		164	#define USB_DEVICE_ID_AXENTIA_FM_RADIO 0x7111
		165
163	#define USB_VENDOR_ID_BAANTO 0x2453	166	#define USB_VENDOR_ID_BAANTO 0x2453
164	#define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100	167	#define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100
165		168

drivers/hid/hid-logitech-dj.c+24−14

@@ -436,27 +436,37 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev, · 435 unmodified lines
436		436
437	static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)	437	static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
438	{	438	{
439	struct dj_report dj_report;	439	struct dj_report *dj_report;
		440	int retval;
440		441
441	memset(&dj_report, 0, sizeof(dj_report));	442	dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
442	dj_report.report_id = REPORT_ID_DJ_SHORT;	443	if (!dj_report)
443	dj_report.device_index = 0xFF;	444	return -ENOMEM;
444	dj_report.report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;	445	dj_report->report_id = REPORT_ID_DJ_SHORT;
445	return logi_dj_recv_send_report(djrcv_dev, &dj_report);	446	dj_report->device_index = 0xFF;
		447	dj_report->report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;
		448	retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
		449	kfree(dj_report);
		450	return retval;
446	}	451	}
447		452
448	static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,	453	static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
449	unsigned timeout)	454	unsigned timeout)
450	{	455	{
451	struct dj_report dj_report;	456	struct dj_report *dj_report;
		457	int retval;
452		458
453	memset(&dj_report, 0, sizeof(dj_report));	459	dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
454	dj_report.report_id = REPORT_ID_DJ_SHORT;	460	if (!dj_report)
455	dj_report.device_index = 0xFF;	461	return -ENOMEM;
456	dj_report.report_type = REPORT_TYPE_CMD_SWITCH;	462	dj_report->report_id = REPORT_ID_DJ_SHORT;
457	dj_report.report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;	463	dj_report->device_index = 0xFF;
458	dj_report.report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;	464	dj_report->report_type = REPORT_TYPE_CMD_SWITCH;
459	return logi_dj_recv_send_report(djrcv_dev, &dj_report);	465	dj_report->report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;
		466	dj_report->report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;
		467	retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
		468	kfree(dj_report);
		469	return retval;
460	}	470	}
461		471
462		472

drivers/hid/hid-magicmouse.c+4−2

 		__set_bit(EV_ABS, input->evbit);
 		input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
-		input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0);
+		input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2,
-		input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0);
+				     4, 0);
+		input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255 << 2,
+				     4, 0);
 		input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0);
 		/* Note: Touch Y position from the device is inverted relative

drivers/hid/usbhid/Kconfig+4−4

@@ -1,13 +1,13 @@
1	comment "USB Input Devices"	1	menu "USB HID support"
2	depends on USB	2	depends on USB
3		3
4	config USB_HID	4	config USB_HID
5	tristate "USB Human Interface Device (full HID) support"	5	tristate "USB HID transport layer"
6	default y	6	default y
7	depends on USB && INPUT	7	depends on USB && INPUT
8	select HID	8	select HID
9	---help---	9	---help---
10	Say Y here if you want full HID support to connect USB keyboards,	10	Say Y here if you want to connect USB keyboards,
11	mice, joysticks, graphic tablets, or any other HID based devices	11	mice, joysticks, graphic tablets, or any other HID based devices
12	to your computer via USB, as well as Uninterruptible Power Supply	12	to your computer via USB, as well as Uninterruptible Power Supply
13	(UPS) and monitor control devices.	13	(UPS) and monitor control devices.
@@ -81,4 +81,4 @@ config USB_MOUSE · 67 unmodified lines
81		81
82	endmenu	82	endmenu
83		83
84		84	endmenu

drivers/hwmon/applesmc.c+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	*	8	*
9	* Based on hdaps.c driver:	9	* Based on hdaps.c driver:
10	* Copyright (C) 2005 Robert Love <rml@novell.com>	10	* Copyright (C) 2005 Robert Love <rml@novell.com>
11	* Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com>	11	* Copyright (C) 2005 Jesper Juhl <jj@chaosbits.net>
12	*	12	*
13	* Fan control based on smcFanControl:	13	* Fan control based on smcFanControl:
14	* Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com>	14	* Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com>

drivers/hwmon/coretemp.c+2−2

@@ -693,7 +693,7 @@ static void __cpuinit get_core_online(unsigned int cpu) · 692 unmodified lines
693	* sensors. We check this bit only, all the early CPUs	693	* sensors. We check this bit only, all the early CPUs
694	* without thermal sensors will be filtered out.	694	* without thermal sensors will be filtered out.
695	*/	695	*/
696	if (!cpu_has(c, X86_FEATURE_DTS))	696	if (!cpu_has(c, X86_FEATURE_DTHERM))
697	return;	697	return;
698		698
699	if (!pdev) {	699	if (!pdev) {
@@ -794,7 +794,7 @@ static struct notifier_block coretemp_cpu_notifier __refdata = { · 94 unmodified lines
794	};	794	};
795		795
796	static const struct x86_cpu_id coretemp_ids[] = {	796	static const struct x86_cpu_id coretemp_ids[] = {
797	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTS },	797	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM },
798	{}	798	{}
799	};	799	};
800	MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);	800	MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);

drivers/hwmon/jc42.c+1−1

@@ -590,6 +590,6 @@ abort: · 589 unmodified lines
590		590
591	module_i2c_driver(jc42_driver);	591	module_i2c_driver(jc42_driver);
592		592
593	MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");	593	MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
594	MODULE_DESCRIPTION("JC42 driver");	594	MODULE_DESCRIPTION("JC42 driver");
595	MODULE_LICENSE("GPL");	595	MODULE_LICENSE("GPL");

drivers/hwmon/lineage-pem.c+1−1

@@ -567,6 +567,6 @@ static struct i2c_driver pem_driver = { · 566 unmodified lines
567		567
568	module_i2c_driver(pem_driver);	568	module_i2c_driver(pem_driver);
569		569
570	MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");	570	MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
571	MODULE_DESCRIPTION("Lineage CPL PEM hardware monitoring driver");	571	MODULE_DESCRIPTION("Lineage CPL PEM hardware monitoring driver");
572	MODULE_LICENSE("GPL");	572	MODULE_LICENSE("GPL");

drivers/hwmon/ltc4261.c+1−1

@@ -292,6 +292,6 @@ static struct i2c_driver ltc4261_driver = { · 291 unmodified lines
292		292
293	module_i2c_driver(ltc4261_driver);	293	module_i2c_driver(ltc4261_driver);
294		294
295	MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");	295	MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
296	MODULE_DESCRIPTION("LTC4261 driver");	296	MODULE_DESCRIPTION("LTC4261 driver");
297	MODULE_LICENSE("GPL");	297	MODULE_LICENSE("GPL");

drivers/hwmon/max16065.c+1−1

@@ -692,6 +692,6 @@ static struct i2c_driver max16065_driver = { · 691 unmodified lines
692		692
693	module_i2c_driver(max16065_driver);	693	module_i2c_driver(max16065_driver);
694		694
695	MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");	695	MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
696	MODULE_DESCRIPTION("MAX16065 driver");	696	MODULE_DESCRIPTION("MAX16065 driver");
697	MODULE_LICENSE("GPL");	697	MODULE_LICENSE("GPL");

drivers/media/common/saa7146_fops.c+0−5

 	struct saa7146_dev *dev = video_drvdata(file);
 	struct saa7146_fh *fh = NULL;
 	int result = 0;
-	enum v4l2_buf_type type;
 	DEB_EE("file:%p, dev:%s\n", file, video_device_node_name(vdev));
 	DEB_D("using: %p\n", dev);
-	type = vdev->vfl_type == VFL_TYPE_GRABBER
-	     ? V4L2_BUF_TYPE_VIDEO_CAPTURE
-	     : V4L2_BUF_TYPE_VBI_CAPTURE;
 	/* check if an extension is registered */
 	if( NULL == dev->ext ) {
 		DEB_S("no extension registered for this device\n");

drivers/media/dvb/frontends/cx24110.c+2−2

@@ -516,9 +516,9 @@ static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) · 515 unmodified lines
516	if(cx24110_readreg(state,0x10)&0x40) {	516	if(cx24110_readreg(state,0x10)&0x40) {
517	/* the RS error counter has finished one counting window */	517	/* the RS error counter has finished one counting window */
518	cx24110_writereg(state,0x10,0x60); /* select the byer reg */	518	cx24110_writereg(state,0x10,0x60); /* select the byer reg */
519	cx24110_readreg(state, 0x12) \|	519	(void)(cx24110_readreg(state, 0x12) \|
520	(cx24110_readreg(state, 0x13) << 8) \|	520	(cx24110_readreg(state, 0x13) << 8) \|
521	(cx24110_readreg(state, 0x14) << 16);	521	(cx24110_readreg(state, 0x14) << 16));
522	cx24110_writereg(state,0x10,0x70); /* select the bler reg */	522	cx24110_writereg(state,0x10,0x70); /* select the bler reg */
523	state->lastbler=cx24110_readreg(state,0x12)\|	523	state->lastbler=cx24110_readreg(state,0x12)\|
524	(cx24110_readreg(state,0x13)<<8)\|	524	(cx24110_readreg(state,0x13)<<8)\|

drivers/media/dvb/frontends/cxd2820r_c.c+1−1

@@ -121,7 +121,7 @@ int cxd2820r_get_frontend_c(struct dvb_frontend *fe) · 120 unmodified lines
121	if (ret)	121	if (ret)
122	goto error;	122	goto error;
123		123
124	switch ((buf[0] >> 0) & 0x03) {	124	switch ((buf[0] >> 0) & 0x07) {
125	case 0:	125	case 0:
126	c->modulation = QAM_16;	126	c->modulation = QAM_16;
127	break;	127	break;

drivers/media/dvb/frontends/lg2160.c+1−1

@@ -126,7 +126,7 @@ static int lg216x_write_regs(struct lg216x_state *state, · 125 unmodified lines
126		126
127	lg_reg("writing %d registers...\n", len);	127	lg_reg("writing %d registers...\n", len);
128		128
129	for (i = 0; i < len - 1; i++) {	129	for (i = 0; i < len; i++) {
130	ret = lg216x_write_reg(state, regs[i].reg, regs[i].val);	130	ret = lg216x_write_reg(state, regs[i].reg, regs[i].val);
131	if (lg_fail(ret))	131	if (lg_fail(ret))
132	return ret;	132	return ret;

drivers/media/dvb/siano/smsusb.c+2−0

@@ -544,6 +544,8 @@ static const struct usb_device_id smsusb_id_table[] __devinitconst = { · 543 unmodified lines
544	.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },	544	.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
545	{ USB_DEVICE(0x2040, 0xc0a0),	545	{ USB_DEVICE(0x2040, 0xc0a0),
546	.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },	546	.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
		547	{ USB_DEVICE(0x2040, 0xf5a0),
		548	.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
547	{ } /* Terminating entry */	549	{ } /* Terminating entry */
548	};	550	};
549		551

drivers/media/radio/radio-maxiradio.c+1−1

@@ -157,7 +157,7 @@ static int __devinit maxiradio_probe(struct pci_dev *pdev, const struct pci_devi · 156 unmodified lines
157	goto err_out_free_region;	157	goto err_out_free_region;
158		158
159	dev->io = pci_resource_start(pdev, 0);	159	dev->io = pci_resource_start(pdev, 0);
160	if (snd_tea575x_init(&dev->tea)) {	160	if (snd_tea575x_init(&dev->tea, THIS_MODULE)) {
161	printk(KERN_ERR "radio-maxiradio: Unable to detect TEA575x tuner\n");	161	printk(KERN_ERR "radio-maxiradio: Unable to detect TEA575x tuner\n");
162	goto err_out_free_region;	162	goto err_out_free_region;
163	}	163	}

drivers/media/radio/radio-sf16fmr2.c+1−1

@@ -238,7 +238,7 @@ static int __devinit fmr2_probe(struct fmr2 fmr2, struct device pdev, int io) · 237 unmodified lines
238	snprintf(fmr2->tea.bus_info, sizeof(fmr2->tea.bus_info), "%s:%s",	238	snprintf(fmr2->tea.bus_info, sizeof(fmr2->tea.bus_info), "%s:%s",
239	fmr2->is_fmd2 ? "PnP" : "ISA", dev_name(pdev));	239	fmr2->is_fmd2 ? "PnP" : "ISA", dev_name(pdev));
240		240
241	if (snd_tea575x_init(&fmr2->tea)) {	241	if (snd_tea575x_init(&fmr2->tea, THIS_MODULE)) {
242	printk(KERN_ERR "radio-sf16fmr2: Unable to detect TEA575x tuner\n");	242	printk(KERN_ERR "radio-sf16fmr2: Unable to detect TEA575x tuner\n");
243	release_region(fmr2->io, 2);	243	release_region(fmr2->io, 2);
244	return -ENODEV;	244	return -ENODEV;

drivers/media/radio/si470x/radio-si470x-usb.c+2−0

 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) },
 	/* Sanei Electric, Inc. FM USB Radio (sold as DealExtreme.com PCear) */
 	{ USB_DEVICE_AND_INTERFACE_INFO(0x10c5, 0x819a, USB_CLASS_HID, 0, 0) },
+	/* Axentia ALERT FM USB Receiver */
+	{ USB_DEVICE_AND_INTERFACE_INFO(0x12cf, 0x7111, USB_CLASS_HID, 0, 0) },
 	/* Terminating entry */
 	{ }
 };

drivers/media/video/bt8xx/bttv-cards.c+6−78

 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 2, 0, 0, 0 },
 		.gpiomute 	= 10,
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0, 1, 2, 3 },
 		.gpiomute 	= 4,
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.gpiomux 	= { 4, 0, 2, 3 },
 		.gpiomute 	= 1,
 		.no_msp34xx	= 1,
-		.needs_tvaudio	= 1,
 		.tuner_type     = TUNER_PHILIPS_NTSC,
 		.tuner_addr	= ADDR_UNSET,
 		.pll            = PLL_28,
 		.gpiomask	= 0,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0 },
-		.needs_tvaudio	= 0,
 		.tuner_type	= TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.muxsel		= MUXSEL(2, 3, 1, 0),
 		.gpiomux 	= { 0, 1, 0, 1 },
 		.gpiomute 	= 3,
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.gpiomask	= 0x0f,
 		.gpiomux 	= { 0x0c, 0x04, 0x08, 0x04 },
 		/*                0x04 for some cards ?? */
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.audio_mode_gpio= avermedia_tvphone_audio,
 		.gpiomask	= 0,
 		.muxsel		= MUXSEL(2, 3, 1, 0, 0),
 		.gpiomux 	= { 0 },
-		.needs_tvaudio	= 1,
 		.tuner_type	= TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0, 0xc00, 0x800, 0x400 },
 		.gpiomute 	= 0xc00,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomask	= 3,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 1, 1, 2, 3 },
-		.needs_tvaudio	= 0,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_TEMIC_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 0, 1, 1),
 		.gpiomux 	= { 0, 1, 2, 3 },
 		.gpiomute 	= 4,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0x20001,0x10001, 0, 0 },
 		.gpiomute 	= 10,
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.gpiomask	= 15,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 13, 14, 11, 7 },
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.gpiomask	= 15,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 13, 14, 11, 7 },
-		.needs_tvaudio	= 1,
 		.msp34xx_alt    = 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */
 		.gpiomute 	= 4,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0, 0, 1, 0 },
 		.gpiomute 	= 10,
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		/* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
 		.gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
 		.gpiomute 	= 0x002000,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr     = ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1, 0),
 		.gpiomux 	= { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 },
 		.gpiomute 	= 0xcfa007,
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.volume_gpio	= winview_volume,
 		.gpiomask	= 0,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 1, 0, 0, 0 },
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0, 1, 0x800, 0x400 },
 		.gpiomute 	= 0xc00,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= {0x400, 0x400, 0x400, 0x400 },
 		.gpiomute 	= 0xc00,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0x20000, 0x30000, 0x10000, 0 },
 		.gpiomute 	= 0x40000,
-		.needs_tvaudio	= 0,
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.audio_mode_gpio= terratv_audio,
 		.muxsel		= MUXSEL(2, 0, 1, 1),
 		.gpiomux 	= { 0, 1, 2, 3 },
 		.gpiomute 	= 4,
-		.needs_tvaudio	= 1,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0x20000, 0x30000, 0x10000, 0x00000 },
 		.gpiomute 	= 0x40000,
-		.needs_tvaudio	= 0,
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.audio_mode_gpio= terratv_audio,
 		.gpiomask	= 0,
 		.muxsel		= MUXSEL(2, 3, 1, 0, 0),
 		.gpiomux 	= { 0 },
-		.needs_tvaudio	= 1,
 		.tuner_type	= TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel_hook    = PXC200_muxsel,
 		.gpiomask	= 0,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0 },
-		.needs_tvaudio	= 0,
 		.tuner_type	= TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0x500, 0, 0x300, 0x900 },
 		.gpiomute 	= 0x900,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		Note: There exists another variant "Winfast 2000" with tv stereo !?
 		Note: eeprom only contains FF and pci subsystem id 107d:6606
 		*/
-		.needs_tvaudio	= 0,
 		.pll		= PLL_28,
 		.has_radio	= 1,
 		.tuner_type	= TUNER_PHILIPS_PAL, /* default for now, gpio reads BFFF06 for Pal bg+dk */
 		.muxsel		= MUXSEL(2, 3, 1, 0),
 		.gpiomux 	= { 0x551400, 0x551200, 0, 0 },
 		.gpiomute 	= 0x551c00,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_PAL_I,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 2, 0xd0001, 0, 0 },
 		.gpiomute 	= 1,
-		.needs_tvaudio	= 0,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomux 	= { 4, 0, 2, 3 },
 		.gpiomute 	= 1,
 		.no_msp34xx	= 1,
-		.needs_tvaudio	= 1,
 		.tuner_type     = TUNER_PHILIPS_NTSC,
 		.tuner_addr	= ADDR_UNSET,
 		.pll            = PLL_28,
 		.gpiomask	= 15,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 13, 4, 11, 7 },
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomask	= 0,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0, 0, 0, 0},
-		.needs_tvaudio	= 1,
 		.no_msp34xx	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_PAL_I,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0x20000, 0x30000, 0x10000, 0 },
 		.gpiomute 	= 0x40000,
-		.needs_tvaudio	= 1,
 		.no_msp34xx	= 1,
 		.pll		= PLL_35,
 		.tuner_type	= TUNER_PHILIPS_PAL_I,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= {2,0,0,0 },
 		.gpiomute 	= 1,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= UNSET,
 		.tuner_addr	= ADDR_UNSET,
 				MUX2 (mask 0x30000):
 					0,2,3= from MSP34xx
 					1= FM stereo Radio from Tuner */
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0, 0, 0x10, 8 },
 		.gpiomute 	= 4,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 3, 1, 0),
 		.gpiomux        = { 2, 0, 0, 0 },
 		.gpiomute 	= 10,
-		.needs_tvaudio  = 0,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_TEMIC_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomask       = 0,
 		.muxsel         = MUXSEL(3, 1),
 		.gpiomux        = { 0 },
-		.needs_tvaudio  = 0,
 		.no_msp34xx     = 1,
 		.pll            = PLL_35,
 		.tuner_type     = TUNER_ABSENT,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0x400, 0x400, 0x400, 0x400 },
 		.gpiomute 	= 0x800,
-		.needs_tvaudio  = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_TEMIC_4036FY5_NTSC,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 2),
 		.gpiomux        = { },
 		.no_msp34xx     = 1,
-		.needs_tvaudio  = 0,
 		.pll		= PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 3, 1, 0),
 		.gpiomux        = { 1, 0, 4, 4 },
 		.gpiomute 	= 9,
-		.needs_tvaudio  = 0,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomute 	= 0x1800,
 		.audio_mode_gpio= fv2000s_audio,
 		.no_msp34xx	= 1,
-		.needs_tvaudio  = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0x500, 0x500, 0x300, 0x900 },
 		.gpiomute 	= 0x900,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0, 0, 11, 7 }, /* TV and Radio with same GPIO ! */
 		.gpiomute 	= 13,
-		.needs_tvaudio  = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_LG_PAL_I_FM,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 0x01, 0x00, 0x03, 0x03 },
 		.gpiomute 	= 0x09,
-		.needs_tvaudio  = 1,
 		.no_msp34xx	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.gpiomask       = 0,
 		.muxsel         = MUXSEL(2, 3, 1, 0, 0),
 		.gpiomux        = { 0 },
-		.needs_tvaudio  = 0,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.muxsel         = MUXSEL(2, 1, 1),
 		.gpiomux        = { 0, 1, 2, 2 },
 		.gpiomute 	= 4,
-		.needs_tvaudio  = 0,
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.pll		= PLL_28,
 		.gpiomask       = 0,
 		.muxsel         = MUXSEL(2, 3, 1, 0),
 		.gpiomux        = { 0 },
-		.needs_tvaudio  = 0,
 		.no_msp34xx     = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 						* btwincap uses 0x80000/0x80003
 						*/
 		.gpiomute 	= 4,
-		.needs_tvaudio  = 0,
 		.no_msp34xx     = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		/* .audio_inputs= 1, */
 		.svhs           = 2,
 		.muxsel         = MUXSEL(2, 0, 1, 1),
-		.needs_tvaudio  = 1,
 		.pll            = PLL_28,
 		.tuner_type     = UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0, 1, 2, 3},
 		.gpiomute 	= 4,
-		.needs_tvaudio  = 1,
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.pll            = PLL_28,
 		.gpiomask       = 0,
 		.muxsel         = MUXSEL(2, 3),
 		.gpiomux        = { 0 },
-		.needs_tvaudio  = 0,
 		.no_msp34xx     = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		/*                  Tuner, Radio, external, internal, off,  on */
 		.gpiomux        = { 0x08,  0x0f,  0x0a,     0x08 },
 		.gpiomute 	= 0x0f,
-		.needs_tvaudio  = 0,
 		.no_msp34xx     = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_PHILIPS_NTSC,
 		.svhs           = 2,
 		.gpiomask       = 0x00,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
-		.needs_tvaudio  = 1,
 		.no_msp34xx     = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		.gpiomask       = 0,
 		.muxsel         = MUXSEL(2, 3, 1, 0),
 		.gpiomux        = { 0 },
-		.needs_tvaudio  = 0,
 		.no_msp34xx     = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.gpiomask       = 0x00,
 		.muxsel         = MUXSEL(2, 3, 1, 0),
 		.gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomask       = 0x00,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 2, 2, 2, 3, 3, 3, 3, 1, 0),
 		.muxsel_hook	= phytec_muxsel,
 		.gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-		.needs_tvaudio  = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 2, 2, 2, 3, 3, 3, 3, 1, 1),
 		.muxsel_hook	= phytec_muxsel,
 		.gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-		.needs_tvaudio  = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.svhs           = NO_SVHS,   /* card has no svhs */
-		.needs_tvaudio  = 0,
 		.no_msp34xx     = 1,
 		.no_tda7432     = 1,
 		.gpiomask       = 0x00,
 		.gpiomask       = 3,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 1, 1, 1, 1 },
-		.needs_tvaudio  = 1,
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.pll            = PLL_35,
 		.muxsel         = MUXSEL(2, 3, 1, 0),
 		.no_msp34xx     = 1,
 		.no_tda7432     = 1,
-		.needs_tvaudio  = 0,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 	},
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.svhs           = 2,
-		.needs_tvaudio  = 0,
 		.gpiomask       = 0x68,
 		.muxsel         = MUXSEL(2, 3, 1),
 		.gpiomux        = { 0x68, 0x68, 0x61, 0x61 },
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0, 1, 2, 2 },
 		.gpiomute 	= 3,
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 2, 2, 2),
 		.gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
 		.pll            = PLL_28,
-		.needs_tvaudio  = 0,
 		.muxsel_hook    = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 2, 0, 0, 0 },
 		.gpiomute 	= 10,
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_PHILIPS_PAL,
 		.tuner_addr	= ADDR_UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomask       = 0x008007,
 		.gpiomux        = { 0, 0x000001,0,0 },
-		.needs_tvaudio  = 1,
 		.has_radio      = 1,
 	},
 	[BTTV_BOARD_TIBET_CS16] = {
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
 		.gpiomute 	= 0x002000,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_YMEC_TVF66T5_B_DFF,
 		.tuner_addr	= 0xc1 >>1,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0, 1, 2, 2 },
 		.gpiomute 	= 3,
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_TENA_9533_DI,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel		= MUXSEL(2, 3, 1, 1),
 		.gpiomux 	= { 2, 0, 0, 0 },
 		.gpiomute 	= 1,
-		.needs_tvaudio	= 1,
 		.pll		= PLL_28,
 		.tuner_type	= TUNER_PHILIPS_NTSC,
 		.tuner_addr	= ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0x20001,0x10001, 0, 0 },
 		.gpiomute       = 10,
-		.needs_tvaudio  = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_PHILIPS_PAL_I,
 		.tuner_addr     = ADDR_UNSET,
 		.muxsel         = MUXSEL(2, 3, 1, 1),
 		.gpiomux        = { 0, 1, 2, 2 }, /* CONTVFMi */
 		.gpiomute 	= 3, /* CONTVFMi */
-		.needs_tvaudio  = 0,
 		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */
 		.tuner_addr     = ADDR_UNSET,
 		.pll            = PLL_28,
 		.gpiomask       = 0x00,
 		.muxsel         = MUXSEL(0, 2, 3, 1),
 		.gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomask       = 0x00,
 		.muxsel         = MUXSEL(2, 3, 1),
 		.gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomask       = 0x00,
 		.muxsel         = MUXSEL(3, 2, 1),
 		.gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-		.needs_tvaudio  = 0,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		.tuner_addr	= ADDR_UNSET,
 		.gpiomask       = 0,
 		.muxsel         = MUXSEL(2, 3),
 		.gpiomux        = { 0 },
-		.needs_tvaudio  = 0,
 		.no_msp34xx     = 1,
 		.pll            = PLL_28,
 		.tuner_type     = TUNER_ABSENT,
 		struct tuner_setup tun_setup;
 		/* Load tuner module before issuing tuner config call! */
-		if (bttv_tvcards[btv->c.type].has_radio)
+		if (btv->has_radio)
 			v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
 				&btv->c.i2c_adap, "tuner",
 				0, v4l2_i2c_tuner_addrs(ADDRS_RADIO));
 		tun_setup.type = btv->tuner_type;
 		tun_setup.addr = addr;
-		if (bttv_tvcards[btv->c.type].has_radio)
+		if (btv->has_radio)
 			tun_setup.mode_mask |= T_RADIO;
 		bttv_call_all(btv, tuner, s_type_addr, &tun_setup);
 			bttv_tvcards[BTTV_BOARD_HAUPPAUGE_IMPACTVCB].name);
 		btv->c.type = BTTV_BOARD_HAUPPAUGE_IMPACTVCB;
 	}
+	/* The 61334 needs the msp3410 to do the radio demod to get sound */
+	if (tv.model == 61334)
+		btv->radio_uses_msp_demodulator = 1;
 }
 static int terratec_active_radio_upgrade(struct bttv *btv)

drivers/media/video/bt8xx/bttv-driver.c+5−0

 		   For now this is sufficient. */
 		switch (input) {
 		case TVAUDIO_INPUT_RADIO:
+			/* Some boards need the msp do to the radio demod */
+			if (btv->radio_uses_msp_demodulator) {
+				in = MSP_INPUT_DEFAULT;
+				break;
+			}
 			in = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
 				    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
 			break;

drivers/media/video/bt8xx/bttv.h+0−1

@@ -236,7 +236,6 @@ struct tvcard { · 235 unmodified lines
236	/* i2c audio flags */	236	/* i2c audio flags */
237	unsigned int no_msp34xx:1;	237	unsigned int no_msp34xx:1;
238	unsigned int no_tda7432:1;	238	unsigned int no_tda7432:1;
239	unsigned int needs_tvaudio:1;
240	unsigned int msp34xx_alt:1;	239	unsigned int msp34xx_alt:1;
241	/* Note: currently no card definition needs to mark the presence	240	/* Note: currently no card definition needs to mark the presence
242	of a RDS saa6588 chip. If this is ever needed, then add a new	241	of a RDS saa6588 chip. If this is ever needed, then add a new

drivers/media/video/bt8xx/bttvp.h+1−0

@@ -440,6 +440,7 @@ struct bttv { · 439 unmodified lines
440	/* radio data/state */	440	/* radio data/state */
441	int has_radio;	441	int has_radio;
442	int radio_user;	442	int radio_user;
		443	int radio_uses_msp_demodulator;
443		444
444	/* miro/pinnacle + Aimslab VHX	445	/* miro/pinnacle + Aimslab VHX
445	philips matchbox (tea5757 radio tuner) support */	446	philips matchbox (tea5757 radio tuner) support */

drivers/media/video/bw-qcam.c+37−10

 				}
 				o = i * pixels_per_line + pixels_read + k;
 				if (o < len) {
+					u8 ch = invert - buffer[k];
 					got++;
-					put_user((invert - buffer[k]) << shift, buf + o);
+					put_user(ch << shift, buf + o);
 				}
 			}
 			pixels_read += bytes;
 	struct qcam *qcam = video_drvdata(file);
 	strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver));
-	strlcpy(vcap->card, "B&W Quickcam", sizeof(vcap->card));
+	strlcpy(vcap->card, "Connectix B&W Quickcam", sizeof(vcap->card));
-	strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info));
+	strlcpy(vcap->bus_info, qcam->pport->name, sizeof(vcap->bus_info));
 	vcap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
 	vcap->capabilities = vcap->device_caps | V4L2_CAP_DEVICE_CAPS;
 	return 0;
 	pix->height = qcam->height / qcam->transfer_scale;
 	pix->pixelformat = (qcam->bpp == 4) ? V4L2_PIX_FMT_Y4 : V4L2_PIX_FMT_Y6;
 	pix->field = V4L2_FIELD_NONE;
-	pix->bytesperline = qcam->width;
+	pix->bytesperline = pix->width;
-	pix->sizeimage = qcam->width * qcam->height;
+	pix->sizeimage = pix->width * pix->height;
 	/* Just a guess */
 	pix->colorspace = V4L2_COLORSPACE_SRGB;
 	return 0;
 		  "4-Bit Monochrome", V4L2_PIX_FMT_Y4,
 		  { 0, 0, 0, 0 }
 		},
-		{ 0, 0, 0,
+		{ 1, 0, 0,
 		  "6-Bit Monochrome", V4L2_PIX_FMT_Y6,
 		  { 0, 0, 0, 0 }
 		},
 	return 0;
 }
+static int qcam_enum_framesizes(struct file *file, void *fh,
+					 struct v4l2_frmsizeenum *fsize)
+{
+	static const struct v4l2_frmsize_discrete sizes[] = {
+		{  80,  60 },
+		{ 160, 120 },
+		{ 320, 240 },
+	};
+	if (fsize->index > 2)
+		return -EINVAL;
+	if (fsize->pixel_format != V4L2_PIX_FMT_Y4 &&
+	    fsize->pixel_format != V4L2_PIX_FMT_Y6)
+		return -EINVAL;
+	fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+	fsize->discrete = sizes[fsize->index];
+	return 0;
+}
 static ssize_t qcam_read(struct file *file, char __user *buf,
 		size_t count, loff_t *ppos)
 {
 	return len;
 }
+static unsigned int qcam_poll(struct file *filp, poll_table *wait)
+{
+	return v4l2_ctrl_poll(filp, wait) | POLLIN | POLLRDNORM;
+}
 static int qcam_s_ctrl(struct v4l2_ctrl *ctrl)
 {
 	struct qcam *qcam =
 	.owner		= THIS_MODULE,
 	.open		= v4l2_fh_open,
 	.release	= v4l2_fh_release,
-	.poll		= v4l2_ctrl_poll,
+	.poll		= qcam_poll,
 	.unlocked_ioctl = video_ioctl2,
 	.read		= qcam_read,
 };
 	.vidioc_s_input      		    = qcam_s_input,
 	.vidioc_enum_input   		    = qcam_enum_input,
 	.vidioc_enum_fmt_vid_cap 	    = qcam_enum_fmt_vid_cap,
+	.vidioc_enum_framesizes		    = qcam_enum_framesizes,
 	.vidioc_g_fmt_vid_cap 		    = qcam_g_fmt_vid_cap,
 	.vidioc_s_fmt_vid_cap  		    = qcam_s_fmt_vid_cap,
 	.vidioc_try_fmt_vid_cap  	    = qcam_try_fmt_vid_cap,
 		return NULL;
 	v4l2_dev = &qcam->v4l2_dev;
-	strlcpy(v4l2_dev->name, "bw-qcam", sizeof(v4l2_dev->name));
+	snprintf(v4l2_dev->name, sizeof(v4l2_dev->name), "bw-qcam%d", num_cams);
-	if (v4l2_device_register(NULL, v4l2_dev) < 0) {
+	if (v4l2_device_register(port->dev, v4l2_dev) < 0) {
 		v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
 		kfree(qcam);
 		return NULL;
 		return NULL;
 	}
 	qcam->pport = port;
-	qcam->pdev = parport_register_device(port, "bw-qcam", NULL, NULL,
+	qcam->pdev = parport_register_device(port, v4l2_dev->name, NULL, NULL,
 			NULL, 0, NULL);
 	if (qcam->pdev == NULL) {
 		v4l2_err(v4l2_dev, "couldn't register for %s.\n", port->name);
 		return -ENODEV;
 	}
 	qc_calibrate(qcam);
+	v4l2_ctrl_handler_setup(&qcam->hdl);
 	parport_release(qcam->pdev);

drivers/media/video/cx18/cx18-driver.c+5−5

@@ -838,10 +838,10 @@ static int cx18_setup_pci(struct cx18 cx, struct pci_dev pci_dev, · 837 unmodified lines
838	}	838	}
839		839
840	CX18_DEBUG_INFO("cx%d (rev %d) at %02x:%02x.%x, "	840	CX18_DEBUG_INFO("cx%d (rev %d) at %02x:%02x.%x, "
841	"irq: %d, latency: %d, memory: 0x%lx\n",	841	"irq: %d, latency: %d, memory: 0x%llx\n",
842	cx->pci_dev->device, cx->card_rev, pci_dev->bus->number,	842	cx->pci_dev->device, cx->card_rev, pci_dev->bus->number,
843	PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn),	843	PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn),
844	cx->pci_dev->irq, pci_latency, (unsigned long)cx->base_addr);	844	cx->pci_dev->irq, pci_latency, (u64)cx->base_addr);
845		845
846	return 0;	846	return 0;
847	}	847	}
@@ -938,7 +938,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev, · 90 unmodified lines
938	if (retval)	938	if (retval)
939	goto err;	939	goto err;
940		940
941	CX18_DEBUG_INFO("base addr: 0x%08x\n", cx->base_addr);	941	CX18_DEBUG_INFO("base addr: 0x%llx\n", (u64)cx->base_addr);
942		942
943	/* PCI Device Setup */	943	/* PCI Device Setup */
944	retval = cx18_setup_pci(cx, pci_dev, pci_id);	944	retval = cx18_setup_pci(cx, pci_dev, pci_id);
@@ -946,8 +946,8 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev, · 1 unmodified line
946	goto free_workqueues;	946	goto free_workqueues;
947		947
948	/* map io memory */	948	/* map io memory */
949	CX18_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",	949	CX18_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
950	cx->base_addr + CX18_MEM_OFFSET, CX18_MEM_SIZE);	950	(u64)cx->base_addr + CX18_MEM_OFFSET, CX18_MEM_SIZE);
951	cx->enc_mem = ioremap_nocache(cx->base_addr + CX18_MEM_OFFSET,	951	cx->enc_mem = ioremap_nocache(cx->base_addr + CX18_MEM_OFFSET,
952	CX18_MEM_SIZE);	952	CX18_MEM_SIZE);
953	if (!cx->enc_mem) {	953	if (!cx->enc_mem) {

drivers/media/video/cx18/cx18-driver.h+1−1

@@ -622,7 +622,7 @@ struct cx18 { · 621 unmodified lines
622	unique ID. Starts at 1, so 0 can be used as	622	unique ID. Starts at 1, so 0 can be used as
623	uninitialized value in the stream->id. */	623	uninitialized value in the stream->id. */
624		624
625	u32 base_addr;	625	resource_size_t base_addr;
626		626
627	u8 card_rev;	627	u8 card_rev;
628	void __iomem enc_mem, reg_mem;	628	void __iomem enc_mem, reg_mem;

drivers/media/video/cx18/cx18-firmware.c+7−2

@@ -164,8 +164,13 @@ static int load_apu_fw_direct(const char fn, u8 __iomem dst, struct cx18 *cx, · 163 unmodified lines
164		164
165	apu_version = (vers[0] << 24) \| (vers[4] << 16) \| vers[32];	165	apu_version = (vers[0] << 24) \| (vers[4] << 16) \| vers[32];
166	while (offset + sizeof(seghdr) < fw->size) {	166	while (offset + sizeof(seghdr) < fw->size) {
167	/* TODO: byteswapping */	167	const u32 *shptr = src + offset / 4;
168	memcpy(&seghdr, src + offset / 4, sizeof(seghdr));	168
		169	seghdr.sync1 = le32_to_cpu(shptr[0]);
		170	seghdr.sync2 = le32_to_cpu(shptr[1]);
		171	seghdr.addr = le32_to_cpu(shptr[2]);
		172	seghdr.size = le32_to_cpu(shptr[3]);
		173
169	offset += sizeof(seghdr);	174	offset += sizeof(seghdr);
170	if (seghdr.sync1 != APU_ROM_SYNC1 \|\|	175	if (seghdr.sync1 != APU_ROM_SYNC1 \|\|
171	seghdr.sync2 != APU_ROM_SYNC2) {	176	seghdr.sync2 != APU_ROM_SYNC2) {

drivers/media/video/cx18/cx18-mailbox.c+10−5

 {
 	u32 handle, mdl_ack_offset, mdl_ack_count;
 	struct cx18_mailbox *mb;
+	int i;
 	mb = &order->mb;
 	handle = mb->args[0];
 		return -1;
 	}
-	cx18_memcpy_fromio(cx, order->mdl_ack, cx->enc_mem + mdl_ack_offset,
+	for (i = 0; i < sizeof(struct cx18_mdl_ack) * mdl_ack_count; i += sizeof(u32))
-			   sizeof(struct cx18_mdl_ack) * mdl_ack_count);
+		((u32 *)order->mdl_ack)[i / sizeof(u32)] =
+			cx18_readl(cx, cx->enc_mem + mdl_ack_offset + i);
 	if ((order->flags & CX18_F_EWO_MB_STALE) == 0)
 		mb_ack_irq(cx, order);
 	struct cx18_mailbox *order_mb;
 	struct cx18_in_work_order *order;
 	int submit;
+	int i;
 	switch (rpu) {
 	case CPU:
 	order_mb = &order->mb;
 	/* mb->cmd and mb->args[0] through mb->args[2] */
-	cx18_memcpy_fromio(cx, &order_mb->cmd, &mb->cmd, 4 * sizeof(u32));
+	for (i = 0; i < 4; i++)
+		(&order_mb->cmd)[i] = cx18_readl(cx, &mb->cmd + i);
 	/* mb->request and mb->ack.  N.B. we want to read mb->ack last */
-	cx18_memcpy_fromio(cx, &order_mb->request, &mb->request,
+	for (i = 0; i < 2; i++)
-			   2 * sizeof(u32));
+		(&order_mb->request)[i] = cx18_readl(cx, &mb->request + i);
 	if (order_mb->request == order_mb->ack) {
 		CX18_DEBUG_WARN("Possibly falling behind: %s self-ack'ed our "

drivers/media/video/cx88/cx88-blackbird.c+1−1

@@ -471,7 +471,7 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) · 470 unmodified lines
471	dprintk(1,"Loading firmware ...\n");	471	dprintk(1,"Loading firmware ...\n");
472	dataptr = (u32*)firmware->data;	472	dataptr = (u32*)firmware->data;
473	for (i = 0; i < (firmware->size >> 2); i++) {	473	for (i = 0; i < (firmware->size >> 2); i++) {
474	value = *dataptr;	474	value = le32_to_cpu(*dataptr);
475	checksum += ~value;	475	checksum += ~value;
476	memory_write(dev->core, i, value);	476	memory_write(dev->core, i, value);
477	dataptr++;	477	dataptr++;

drivers/media/video/em28xx/em28xx-cards.c+1−0

@@ -974,6 +974,7 @@ struct em28xx_board em28xx_boards[] = { · 973 unmodified lines
974	[EM2884_BOARD_CINERGY_HTC_STICK] = {	974	[EM2884_BOARD_CINERGY_HTC_STICK] = {
975	.name = "Terratec Cinergy HTC Stick",	975	.name = "Terratec Cinergy HTC Stick",
976	.has_dvb = 1,	976	.has_dvb = 1,
		977	.ir_codes = RC_MAP_NEC_TERRATEC_CINERGY_XS,
977	#if 0	978	#if 0
978	.tuner_type = TUNER_PHILIPS_TDA8290,	979	.tuner_type = TUNER_PHILIPS_TDA8290,
979	.tuner_addr = 0x41,	980	.tuner_addr = 0x41,

drivers/media/video/em28xx/em28xx-input.c+2−0

@@ -527,6 +527,8 @@ static int em28xx_ir_init(struct em28xx *dev) · 526 unmodified lines
527		527
528	if (dev->board.ir_codes == NULL) {	528	if (dev->board.ir_codes == NULL) {
529	/* No remote control support */	529	/* No remote control support */
		530	em28xx_warn("Remote control support is not available for "
		531	"this card.\n");
530	return 0;	532	return 0;
531	}	533	}
532		534

drivers/media/video/gspca/gspca.c+3−1

 				enum v4l2_buf_type buf_type)
 {
 	struct gspca_dev *gspca_dev = video_drvdata(file);
-	int ret;
+	int i, ret;
 	if (buf_type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 		return -EINVAL;
 	wake_up_interruptible(&gspca_dev->wq);
 	/* empty the transfer queues */
+	for (i = 0; i < gspca_dev->nframes; i++)
+		gspca_dev->frame[i].v4l2_buf.flags &= ~BUF_ALL_FLAGS;
 	atomic_set(&gspca_dev->fr_q, 0);
 	atomic_set(&gspca_dev->fr_i, 0);
 	gspca_dev->fr_o = 0;

drivers/media/video/gspca/ov534.c+3−29

 static void setcontrast(struct gspca_dev *gspca_dev);
 static void setgain(struct gspca_dev *gspca_dev);
 static void setexposure(struct gspca_dev *gspca_dev);
-static int sd_setagc(struct gspca_dev *gspca_dev, __s32 val);
+static void setagc(struct gspca_dev *gspca_dev);
 static void setawb(struct gspca_dev *gspca_dev);
 static void setaec(struct gspca_dev *gspca_dev);
 static void setsharpness(struct gspca_dev *gspca_dev);
 			.step    = 1,
 			.default_value = 1,
 		},
-		.set = sd_setagc
+		.set_control = setagc
 	},
 [AWB] = {
 		{
 	int i;
 	for (i = 0; i < 5; i++) {
+		msleep(10);
 		data = ov534_reg_read(gspca_dev, OV534_REG_STATUS);
 		switch (data) {
 	cam->ctrls = sd->ctrls;
-	/* the auto white balance control works only when auto gain is set */
-	if (sd_ctrls[AGC].qctrl.default_value == 0)
-		gspca_dev->ctrl_inac |= (1 << AWB);
 	cam->cam_mode = ov772x_mode;
 	cam->nmodes = ARRAY_SIZE(ov772x_mode);
 	} while (remaining_len > 0);
 }
-static int sd_setagc(struct gspca_dev *gspca_dev, __s32 val)
-{
-	struct sd *sd = (struct sd *) gspca_dev;
-	sd->ctrls[AGC].val = val;
-	/* the auto white balance control works only
-	 * when auto gain is set */
-	if (val) {
-		gspca_dev->ctrl_inac &= ~(1 << AWB);
-	} else {
-		gspca_dev->ctrl_inac |= (1 << AWB);
-		if (sd->ctrls[AWB].val) {
-			sd->ctrls[AWB].val = 0;
-			if (gspca_dev->streaming)
-				setawb(gspca_dev);
-		}
-	}
-	if (gspca_dev->streaming)
-		setagc(gspca_dev);
-	return gspca_dev->usb_err;
-}
 static int sd_querymenu(struct gspca_dev *gspca_dev,
 		struct v4l2_querymenu *menu)
 {

drivers/media/video/gspca/ov534_9.c+1−0

@@ -1008,6 +1008,7 @@ static int sccb_check_status(struct gspca_dev *gspca_dev) · 1007 unmodified lines
1008	int i;	1008	int i;
1009		1009
1010	for (i = 0; i < 5; i++) {	1010	for (i = 0; i < 5; i++) {
		1011	msleep(10);
1011	data = reg_r(gspca_dev, OV534_REG_STATUS);	1012	data = reg_r(gspca_dev, OV534_REG_STATUS);
1012		1013
1013	switch (data) {	1014	switch (data) {

drivers/media/video/gspca/pac7311.c+1−1

@@ -418,7 +418,7 @@ static int sd_init_controls(struct gspca_dev *gspca_dev) · 417 unmodified lines
418	struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;	418	struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
419		419
420	gspca_dev->vdev.ctrl_handler = hdl;	420	gspca_dev->vdev.ctrl_handler = hdl;
421	v4l2_ctrl_handler_init(hdl, 4);	421	v4l2_ctrl_handler_init(hdl, 5);
422		422
423	sd->contrast = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,	423	sd->contrast = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
424	V4L2_CID_CONTRAST, 0, 15, 1, 7);	424	V4L2_CID_CONTRAST, 0, 15, 1, 7);

drivers/media/video/gspca/sn9c20x.c+14−10

 			V4L2_CID_SATURATION, 0, 255, 1, 127);
 	sd->hue = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
 			V4L2_CID_HUE, -180, 180, 1, 0);
-	v4l2_ctrl_cluster(4, &sd->brightness);
 	sd->gamma = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
 			V4L2_CID_GAMMA, 0, 255, 1, 0x10);
 			V4L2_CID_BLUE_BALANCE, 0, 127, 1, 0x28);
 	sd->red = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
 			V4L2_CID_RED_BALANCE, 0, 127, 1, 0x28);
-	v4l2_ctrl_cluster(2, &sd->blue);
 	if (sd->sensor != SENSOR_OV9655 && sd->sensor != SENSOR_SOI968 &&
 	    sd->sensor != SENSOR_OV7670 && sd->sensor != SENSOR_MT9M001 &&
 			V4L2_CID_HFLIP, 0, 1, 1, 0);
 		sd->vflip = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
 			V4L2_CID_VFLIP, 0, 1, 1, 0);
-		v4l2_ctrl_cluster(2, &sd->hflip);
 	}
 	if (sd->sensor != SENSOR_SOI968 && sd->sensor != SENSOR_MT9VPRB &&
 			V4L2_CID_GAIN, 0, 28, 1, 0);
 		sd->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
 			V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+	}
+	sd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+			V4L2_CID_JPEG_COMPRESSION_QUALITY, 50, 90, 1, 80);
+	if (hdl->error) {
+		pr_err("Could not initialize controls\n");
+		return hdl->error;
+	}
+	v4l2_ctrl_cluster(4, &sd->brightness);
+	v4l2_ctrl_cluster(2, &sd->blue);
+	if (sd->hflip)
+		v4l2_ctrl_cluster(2, &sd->hflip);
+	if (sd->autogain) {
 		if (sd->sensor == SENSOR_SOI968)
 			/* this sensor doesn't have the exposure control and
 			   autogain is clustered with gain instead. This works
 			/* Otherwise autogain is clustered with exposure. */
 			v4l2_ctrl_auto_cluster(2, &sd->autogain, 0, false);
 	}
-	sd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
-			V4L2_CID_JPEG_COMPRESSION_QUALITY, 50, 90, 1, 80);
-	if (hdl->error) {
-		pr_err("Could not initialize controls\n");
-		return hdl->error;
-	}
 	return 0;
 }

drivers/media/video/gspca/sonixj.c+1−1

@@ -3120,7 +3120,7 @@ static const struct sd_desc sd_desc = { · 3119 unmodified lines
3120	\| (SENSOR_ ## sensor << 8) \	3120	\| (SENSOR_ ## sensor << 8) \
3121	\| (flags)	3121	\| (flags)
3122	static const struct usb_device_id device_table[] = {	3122	static const struct usb_device_id device_table[] = {
3123	{USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},	3123	{USB_DEVICE(0x0458, 0x7025), BSF(SN9C120, MI0360B, F_PDN_INV)},
3124	{USB_DEVICE(0x0458, 0x702e), BS(SN9C120, OV7660)},	3124	{USB_DEVICE(0x0458, 0x702e), BS(SN9C120, OV7660)},
3125	{USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, F_PDN_INV)},	3125	{USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, F_PDN_INV)},
3126	{USB_DEVICE(0x045e, 0x00f7), BSF(SN9C105, OV7660, F_PDN_INV)},	3126	{USB_DEVICE(0x045e, 0x00f7), BSF(SN9C105, OV7660, F_PDN_INV)},

drivers/media/video/ivtv/ivtv-driver.c+9−9

@@ -866,10 +866,10 @@ static int ivtv_setup_pci(struct ivtv itv, struct pci_dev pdev, · 865 unmodified lines
866	pci_write_config_dword(pdev, 0x40, 0xffff);	866	pci_write_config_dword(pdev, 0x40, 0xffff);
867		867
868	IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, "	868	IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, "
869	"irq: %d, latency: %d, memory: 0x%lx\n",	869	"irq: %d, latency: %d, memory: 0x%llx\n",
870	pdev->device, pdev->revision, pdev->bus->number,	870	pdev->device, pdev->revision, pdev->bus->number,
871	PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),	871	PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
872	pdev->irq, pci_latency, (unsigned long)itv->base_addr);	872	pdev->irq, pci_latency, (u64)itv->base_addr);
873		873
874	return 0;	874	return 0;
875	}	875	}
@@ -1007,7 +1007,7 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, · 131 unmodified lines
1007	itv->cxhdl.priv = itv;	1007	itv->cxhdl.priv = itv;
1008	itv->cxhdl.func = ivtv_api_func;	1008	itv->cxhdl.func = ivtv_api_func;
1009		1009
1010	IVTV_DEBUG_INFO("base addr: 0x%08x\n", itv->base_addr);	1010	IVTV_DEBUG_INFO("base addr: 0x%llx\n", (u64)itv->base_addr);
1011		1011
1012	/* PCI Device Setup */	1012	/* PCI Device Setup */
1013	retval = ivtv_setup_pci(itv, pdev, pci_id);	1013	retval = ivtv_setup_pci(itv, pdev, pci_id);
@@ -1017,8 +1017,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, · 3 unmodified lines
1017	goto free_mem;	1017	goto free_mem;
1018		1018
1019	/* map io memory */	1019	/* map io memory */
1020	IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",	1020	IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1021	itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE);	1021	(u64)itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE);
1022	itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET,	1022	itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET,
1023	IVTV_ENCODER_SIZE);	1023	IVTV_ENCODER_SIZE);
1024	if (!itv->enc_mem) {	1024	if (!itv->enc_mem) {
@@ -1034,8 +1034,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, · 9 unmodified lines
1034	}	1034	}
1035		1035
1036	if (itv->has_cx23415) {	1036	if (itv->has_cx23415) {
1037	IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",	1037	IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1038	itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);	1038	(u64)itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);
1039	itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET,	1039	itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET,
1040	IVTV_DECODER_SIZE);	1040	IVTV_DECODER_SIZE);
1041	if (!itv->dec_mem) {	1041	if (!itv->dec_mem) {
@@ -1056,8 +1056,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, · 14 unmodified lines
1056	}	1056	}
1057		1057
1058	/* map registers memory */	1058	/* map registers memory */
1059	IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",	1059	IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1060	itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);	1060	(u64)itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
1061	itv->reg_mem =	1061	itv->reg_mem =
1062	ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);	1062	ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
1063	if (!itv->reg_mem) {	1063	if (!itv->reg_mem) {

drivers/media/video/ivtv/ivtv-driver.h+1−1

@@ -622,7 +622,7 @@ struct ivtv { · 621 unmodified lines
622	struct v4l2_subdev sd_video; / controlling video decoder subdev */	622	struct v4l2_subdev sd_video; / controlling video decoder subdev */
623	struct v4l2_subdev sd_audio; / controlling audio subdev */	623	struct v4l2_subdev sd_audio; / controlling audio subdev */
624	struct v4l2_subdev sd_muxer; / controlling audio muxer subdev */	624	struct v4l2_subdev sd_muxer; / controlling audio muxer subdev */
625	u32 base_addr; /* PCI resource base address */	625	resource_size_t base_addr; /* PCI resource base address */
626	volatile void __iomem enc_mem; / pointer to mapped encoder memory */	626	volatile void __iomem enc_mem; / pointer to mapped encoder memory */
627	volatile void __iomem dec_mem; / pointer to mapped decoder memory */	627	volatile void __iomem dec_mem; / pointer to mapped decoder memory */
628	volatile void __iomem reg_mem; / pointer to mapped registers */	628	volatile void __iomem reg_mem; / pointer to mapped registers */

drivers/media/video/mem2mem_testdev.c+26−24

 	V4L2_M2M_DST = 1,
 };
-/* Source and destination queue data */
-static struct m2mtest_q_data q_data[2];
-static struct m2mtest_q_data *get_q_data(enum v4l2_buf_type type)
-{
-	switch (type) {
-	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-		return &q_data[V4L2_M2M_SRC];
-	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-		return &q_data[V4L2_M2M_DST];
-	default:
-		BUG();
-	}
-	return NULL;
-}
 #define V4L2_CID_TRANS_TIME_MSEC	V4L2_CID_PRIVATE_BASE
 #define V4L2_CID_TRANS_NUM_BUFS		(V4L2_CID_PRIVATE_BASE + 1)
 	int			aborting;
 	struct v4l2_m2m_ctx	*m2m_ctx;
+	/* Source and destination queue data */
+	struct m2mtest_q_data   q_data[2];
 };
+static struct m2mtest_q_data *get_q_data(struct m2mtest_ctx *ctx,
+					 enum v4l2_buf_type type)
+{
+	switch (type) {
+	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+		return &ctx->q_data[V4L2_M2M_SRC];
+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+		return &ctx->q_data[V4L2_M2M_DST];
+	default:
+		BUG();
+	}
+	return NULL;
+}
 static struct v4l2_queryctrl *get_ctrl(int id)
 {
 	int i;
 	int tile_w, bytes_left;
 	int width, height, bytesperline;
-	q_data = get_q_data(V4L2_BUF_TYPE_VIDEO_OUTPUT);
+	q_data = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
 	width	= q_data->width;
 	height	= q_data->height;
 	if (!vq)
 		return -EINVAL;
-	q_data = get_q_data(f->type);
+	q_data = get_q_data(ctx, f->type);
 	f->fmt.pix.width	= q_data->width;
 	f->fmt.pix.height	= q_data->height;
 	if (!vq)
 		return -EINVAL;
-	q_data = get_q_data(f->type);
+	q_data = get_q_data(ctx, f->type);
 	if (!q_data)
 		return -EINVAL;
 	struct m2mtest_q_data *q_data;
 	unsigned int size, count = *nbuffers;
-	q_data = get_q_data(vq->type);
+	q_data = get_q_data(ctx, vq->type);
 	size = q_data->width * q_data->height * q_data->fmt->depth >> 3;
 	dprintk(ctx->dev, "type: %d\n", vb->vb2_queue->type);
-	q_data = get_q_data(vb->vb2_queue->type);
+	q_data = get_q_data(ctx, vb->vb2_queue->type);
 	if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
 		dprintk(ctx->dev, "%s data will not fit into plane (%lu < %lu)\n",
 	ctx->transtime = MEM2MEM_DEF_TRANSTIME;
 	ctx->num_processed = 0;
+	ctx->q_data[V4L2_M2M_SRC].fmt = &formats[0];
+	ctx->q_data[V4L2_M2M_DST].fmt = &formats[0];
 	ctx->m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx, &queue_init);
 	if (IS_ERR(ctx->m2m_ctx)) {
 		goto err_m2m;
 	}
-	q_data[V4L2_M2M_SRC].fmt = &formats[0];
-	q_data[V4L2_M2M_DST].fmt = &formats[0];
 	return 0;
 	v4l2_m2m_release(dev->m2m_dev);

drivers/media/video/mx2_camera.c+5−47

 					PRP_INTR_CH2OVF,
 		}
 	},
-	{
-		.in_fmt		= V4L2_MBUS_FMT_UYVY8_2X8,
-		.out_fmt	= V4L2_PIX_FMT_YUV420,
-		.cfg		= {
-			.channel	= 2,
-			.in_fmt		= PRP_CNTL_DATA_IN_YUV422,
-			.out_fmt	= PRP_CNTL_CH2_OUT_YUV420,
-			.src_pixel	= 0x22000888, /* YUV422 (YUYV) */
-			.irq_flags	= PRP_INTR_RDERR | PRP_INTR_CH2WERR |
-					PRP_INTR_CH2FC | PRP_INTR_LBOVF |
-					PRP_INTR_CH2OVF,
-		}
-	},
 };
 static struct mx2_fmt_cfg *mx27_emma_prp_get_format(
 	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
 	struct mx2_camera_dev *pcdev = ici->priv;
 	struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
-	const struct soc_camera_format_xlate *xlate;
 	unsigned long common_flags;
 	int ret;
 	int bytesperline;
 		return ret;
 	}
-	xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
-	if (!xlate) {
-		dev_warn(icd->parent, "Format %x not found\n", pixfmt);
-		return -EINVAL;
-	}
-	if (xlate->code == V4L2_MBUS_FMT_YUYV8_2X8) {
-		csicr1 |= CSICR1_PACK_DIR;
-		csicr1 &= ~CSICR1_SWAP16_EN;
-		dev_dbg(icd->parent, "already yuyv format, don't convert\n");
-	} else if (xlate->code == V4L2_MBUS_FMT_UYVY8_2X8) {
-		csicr1 &= ~CSICR1_PACK_DIR;
-		csicr1 |= CSICR1_SWAP16_EN;
-		dev_dbg(icd->parent, "convert uyvy mbus format into yuyv\n");
-	} else {
-		dev_warn(icd->parent, "mbus format not supported\n");
-		return -EINVAL;
-	}
 	if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
 		csicr1 |= CSICR1_REDGE;
 	if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
 		csicr1 |= CSICR1_SOF_POL;
 	if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
 		csicr1 |= CSICR1_HSYNC_POL;
+	if (pcdev->platform_flags & MX2_CAMERA_SWAP16)
+		csicr1 |= CSICR1_SWAP16_EN;
 	if (pcdev->platform_flags & MX2_CAMERA_EXT_VSYNC)
 		csicr1 |= CSICR1_EXT_VSYNC;
 	if (pcdev->platform_flags & MX2_CAMERA_CCIR)
 		csicr1 |= CSICR1_GCLK_MODE;
 	if (pcdev->platform_flags & MX2_CAMERA_INV_DATA)
 		csicr1 |= CSICR1_INV_DATA;
+	if (pcdev->platform_flags & MX2_CAMERA_PACK_DIR_MSB)
+		csicr1 |= CSICR1_PACK_DIR;
 	pcdev->csicr1 = csicr1;
 		return 0;
 	}
-	if (code == V4L2_MBUS_FMT_YUYV8_2X8 ||
+	if (code == V4L2_MBUS_FMT_YUYV8_2X8) {
-	    code == V4L2_MBUS_FMT_UYVY8_2X8) {
 		formats++;
 		if (xlate) {
 			/*
 		}
 	}
-	if (code == V4L2_MBUS_FMT_UYVY8_2X8) {
-		formats++;
-		if (xlate) {
-			xlate->host_fmt =
-				soc_mbus_get_fmtdesc(V4L2_MBUS_FMT_YUYV8_2X8);
-			xlate->code	= code;
-			dev_dbg(dev, "Providing host format %s for sensor code %d\n",
-				xlate->host_fmt->name, code);
-			xlate++;
-		}
-	}
 	/* Generic pass-trough */
 	formats++;
 	if (xlate) {

drivers/media/video/s5p-fimc/fimc-core.c+1−1

@@ -615,7 +615,7 @@ int fimc_ctrls_create(struct fimc_ctx *ctx) · 614 unmodified lines
615	ctx->effect.type = FIMC_REG_CIIMGEFF_FIN_BYPASS;	615	ctx->effect.type = FIMC_REG_CIIMGEFF_FIN_BYPASS;
616		616
617	if (!handler->error) {	617	if (!handler->error) {
618	v4l2_ctrl_cluster(3, &ctrls->colorfx);	618	v4l2_ctrl_cluster(2, &ctrls->colorfx);
619	ctrls->ready = true;	619	ctrls->ready = true;
620	}	620	}
621		621

drivers/media/video/s5p-mfc/regs-mfc.h+5−0

 								decoded pic */
 #define S5P_FIMV_SI_DISPLAY_Y_ADR	0x2010 /* luma addr of displayed pic */
 #define S5P_FIMV_SI_DISPLAY_C_ADR	0x2014 /* chroma addrof displayed pic */
 #define S5P_FIMV_SI_CONSUMED_BYTES	0x2018 /* Consumed number of bytes to
 							decode a frame */
 #define S5P_FIMV_SI_DISPLAY_STATUS	0x201c /* status of decoded picture */
+#define S5P_FIMV_SI_DECODE_Y_ADR	0x2024 /* luma addr of decoded pic */
+#define S5P_FIMV_SI_DECODE_C_ADR	0x2028 /* chroma addrof decoded pic */
+#define S5P_FIMV_SI_DECODE_STATUS	0x202c /* status of decoded picture */
 #define S5P_FIMV_SI_CH0_SB_ST_ADR	0x2044 /* start addr of stream buf */
 #define S5P_FIMV_SI_CH0_SB_FRM_SIZE	0x2048 /* size of stream buf */
 #define S5P_FIMV_SI_CH0_DESC_ADR	0x204c /* addr of descriptor buf */

drivers/media/video/s5p-mfc/s5p_mfc_dec.c+2−2

@@ -627,13 +627,13 @@ static int s5p_mfc_dec_s_ctrl(struct v4l2_ctrl *ctrl) · 626 unmodified lines
627		627
628	switch (ctrl->id) {	628	switch (ctrl->id) {
629	case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY:	629	case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY:
630	ctx->loop_filter_mpeg4 = ctrl->val;	630	ctx->display_delay = ctrl->val;
631	break;	631	break;
632	case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE:	632	case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE:
633	ctx->display_delay_enable = ctrl->val;	633	ctx->display_delay_enable = ctrl->val;
634	break;	634	break;
635	case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER:	635	case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER:
636	ctx->display_delay = ctrl->val;	636	ctx->loop_filter_mpeg4 = ctrl->val;
637	break;	637	break;
638	case V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE:	638	case V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE:
639	ctx->slice_interface = ctrl->val;	639	ctx->slice_interface = ctrl->val;

drivers/media/video/s5p-mfc/s5p_mfc_enc.c+4−8

 		.minimum = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
 		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
 		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
-		.menu_skip_mask = ~(
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_2) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_0) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_1)
-				),
 	},
 	{
 		.id = V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
 		.type = V4L2_CTRL_TYPE_MENU,
 		.minimum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
 		.maximum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED,
-		.default_value = 0,
+		.default_value = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
 		.menu_skip_mask = 0,
 	},
 	{
 		.type = V4L2_CTRL_TYPE_MENU,
 		.minimum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
 		.maximum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,
-		.default_value = 0,
+		.default_value = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
 		.menu_skip_mask = 0,
 	},
 	{
 			mfc_err("failed to try output format\n");
 			return -EINVAL;
 		}
+		v4l_bound_align_image(&pix_fmt_mp->width, 8, 1920, 1,
+			&pix_fmt_mp->height, 4, 1080, 1, 0);
 	} else {
 		mfc_err("invalid buf type\n");
 		return -EINVAL;

drivers/media/video/s5p-mfc/s5p_mfc_opr.h+3−1

 					S5P_FIMV_SI_DISPLAY_Y_ADR) << \
 					MFC_OFFSET_SHIFT)
 #define s5p_mfc_get_dec_y_adr()		(readl(dev->regs_base + \
-					S5P_FIMV_SI_DISPLAY_Y_ADR) << \
+					S5P_FIMV_SI_DECODE_Y_ADR) << \
 					MFC_OFFSET_SHIFT)
 #define s5p_mfc_get_dspl_status()	readl(dev->regs_base + \
 						S5P_FIMV_SI_DISPLAY_STATUS)
+#define s5p_mfc_get_dec_status()	readl(dev->regs_base + \
+						S5P_FIMV_SI_DECODE_STATUS)
 #define s5p_mfc_get_frame_type()	(readl(dev->regs_base + \
 						S5P_FIMV_DECODE_FRAME_TYPE) \
 					& S5P_FIMV_DECODE_FRAME_MASK)

drivers/media/video/s5p-mfc/s5p_mfc_shm.h+1−2

@@ -13,8 +13,7 @@ · 12 unmodified lines
13	#ifndef S5P_MFC_SHM_H_	13	#ifndef S5P_MFC_SHM_H_
14	#define S5P_MFC_SHM_H_	14	#define S5P_MFC_SHM_H_
15		15
16	enum MFC_SHM_OFS	16	enum MFC_SHM_OFS {
17	{
18	EXTENEDED_DECODE_STATUS = 0x00, /* D */	17	EXTENEDED_DECODE_STATUS = 0x00, /* D */
19	SET_FRAME_TAG = 0x04, /* D */	18	SET_FRAME_TAG = 0x04, /* D */
20	GET_FRAME_TAG_TOP = 0x08, /* D */	19	GET_FRAME_TAG_TOP = 0x08, /* D */

drivers/media/video/smiapp/Kconfig+1−1

@@ -1,6 +1,6 @@
1	config VIDEO_SMIAPP	1	config VIDEO_SMIAPP
2	tristate "SMIA++/SMIA sensor support"	2	tristate "SMIA++/SMIA sensor support"
3	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API	3	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK
4	select VIDEO_SMIAPP_PLL	4	select VIDEO_SMIAPP_PLL
5	---help---	5	---help---
6	This is a generic driver for SMIA++/SMIA camera modules.	6	This is a generic driver for SMIA++/SMIA camera modules.

drivers/media/video/smiapp/smiapp-core.c+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	#include <linux/gpio.h>	32	#include <linux/gpio.h>
33	#include <linux/module.h>	33	#include <linux/module.h>
34	#include <linux/regulator/consumer.h>	34	#include <linux/regulator/consumer.h>
		35	#include <linux/slab.h>
35	#include <linux/v4l2-mediabus.h>	36	#include <linux/v4l2-mediabus.h>
36	#include <media/v4l2-device.h>	37	#include <media/v4l2-device.h>
37		38

drivers/media/video/tuner-core.c+1−1

@@ -1178,7 +1178,7 @@ static int tuner_g_tuner(struct v4l2_subdev sd, struct v4l2_tuner vt) · 1177 unmodified lines
1178	return 0;	1178	return 0;
1179	if (vt->type == t->mode && analog_ops->get_afc)	1179	if (vt->type == t->mode && analog_ops->get_afc)
1180	vt->afc = analog_ops->get_afc(&t->fe);	1180	vt->afc = analog_ops->get_afc(&t->fe);
1181	if (t->mode != V4L2_TUNER_RADIO) {	1181	if (vt->type != V4L2_TUNER_RADIO) {
1182	vt->capability \|= V4L2_TUNER_CAP_NORM;	1182	vt->capability \|= V4L2_TUNER_CAP_NORM;
1183	vt->rangelow = tv_range[0] * 16;	1183	vt->rangelow = tv_range[0] * 16;
1184	vt->rangehigh = tv_range[1] * 16;	1184	vt->rangehigh = tv_range[1] * 16;

drivers/media/video/v4l2-dev.c+3−1

 	SET_VALID_IOCTL(ops, VIDIOC_TRY_ENCODER_CMD, vidioc_try_encoder_cmd);
 	SET_VALID_IOCTL(ops, VIDIOC_DECODER_CMD, vidioc_decoder_cmd);
 	SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd);
-	if (ops->vidioc_g_parm || vdev->current_norm)
+	if (ops->vidioc_g_parm || vdev->vfl_type == VFL_TYPE_GRABBER)
 		set_bit(_IOC_NR(VIDIOC_G_PARM), valid_ioctls);
 	SET_VALID_IOCTL(ops, VIDIOC_S_PARM, vidioc_s_parm);
 	SET_VALID_IOCTL(ops, VIDIOC_G_TUNER, vidioc_g_tuner);
 	SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_PRESET, vidioc_query_dv_preset);
 	SET_VALID_IOCTL(ops, VIDIOC_S_DV_TIMINGS, vidioc_s_dv_timings);
 	SET_VALID_IOCTL(ops, VIDIOC_G_DV_TIMINGS, vidioc_g_dv_timings);
+	SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings);
+	SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings);
 	/* yes, really vidioc_subscribe_event */
 	SET_VALID_IOCTL(ops, VIDIOC_DQEVENT, vidioc_subscribe_event);
 	SET_VALID_IOCTL(ops, VIDIOC_SUBSCRIBE_EVENT, vidioc_subscribe_event);

drivers/media/video/v4l2-ioctl.c+1−0

@@ -1680,6 +1680,7 @@ static long __video_do_ioctl(struct file *file, · 1679 unmodified lines
1680	break;	1680	break;
1681		1681
1682	ret = 0;	1682	ret = 0;
		1683	p->parm.capture.readbuffers = 2;
1683	if (ops->vidioc_g_std)	1684	if (ops->vidioc_g_std)
1684	ret = ops->vidioc_g_std(file, fh, &std);	1685	ret = ops->vidioc_g_std(file, fh, &std);
1685	if (ret == 0)	1686	if (ret == 0)

drivers/media/video/vino.c+2−2

@@ -2561,7 +2561,7 @@ static int vino_acquire_input(struct vino_channel_settings *vcs) · 2560 unmodified lines
2561	} else if (vino_drvdata->decoder	2561	} else if (vino_drvdata->decoder
2562	&& (vino_drvdata->decoder_owner == VINO_NO_CHANNEL)) {	2562	&& (vino_drvdata->decoder_owner == VINO_NO_CHANNEL)) {
2563	int input;	2563	int input;
2564	int data_norm;	2564	int data_norm = 0;
2565	v4l2_std_id norm;	2565	v4l2_std_id norm;
2566		2566
2567	input = VINO_INPUT_COMPOSITE;	2567	input = VINO_INPUT_COMPOSITE;
@@ -2651,7 +2651,7 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input) · 83 unmodified lines
2651	}	2651	}
2652		2652
2653	if (vino_drvdata->decoder_owner == vcs->channel) {	2653	if (vino_drvdata->decoder_owner == vcs->channel) {
2654	int data_norm;	2654	int data_norm = 0;
2655	v4l2_std_id norm;	2655	v4l2_std_id norm;
2656		2656
2657	ret = decoder_call(video, s_routing,	2657	ret = decoder_call(video, s_routing,

drivers/media/video/vivi.c+5−1

 vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
 {
 	struct vivi_dev *dev = video_drvdata(file);
+	int err;
 	dprintk(dev, 1, "read called\n");
-	return vb2_read(&dev->vb_vidq, data, count, ppos,
+	mutex_lock(&dev->mutex);
+	err = vb2_read(&dev->vb_vidq, data, count, ppos,
 		       file->f_flags & O_NONBLOCK);
+	mutex_unlock(&dev->mutex);
+	return err;
 }
 static unsigned int

drivers/mmc/card/block.c+1−13

 	struct mmc_request mrq = {NULL};
 	struct mmc_command cmd = {0};
 	struct mmc_data data = {0};
-	unsigned int timeout_us;
 	struct scatterlist sg;
 	cmd.arg = 0;
 	cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
-	data.timeout_ns = card->csd.tacc_ns * 100;
-	data.timeout_clks = card->csd.tacc_clks * 100;
-	timeout_us = data.timeout_ns / 1000;
-	timeout_us += data.timeout_clks * 1000 /
-		(card->host->ios.clock / 1000);
-	if (timeout_us > 100000) {
-		data.timeout_ns = 100000000;
-		data.timeout_clks = 0;
-	}
 	data.blksz = 4;
 	data.blocks = 1;
 	data.flags = MMC_DATA_READ;
 	data.sg = &sg;
 	data.sg_len = 1;
+	mmc_set_data_timeout(&data, card);
 	mrq.cmd = &cmd;
 	mrq.data = &data;

drivers/mmc/host/omap_hsmmc.c+3−12

 #define BRR_ENABLE		(1 << 5)
 #define DTO_ENABLE		(1 << 20)
 #define INIT_STREAM		(1 << 1)
-#define ACEN_ACMD12		(1 << 2)
 #define DP_SELECT		(1 << 21)
 #define DDIR			(1 << 4)
 #define DMA_EN			0x1
 #define OMAP_MMC_MAX_CLOCK	52000000
 #define DRIVER_NAME		"omap_hsmmc"
-#define AUTO_CMD12		(1 << 0)	/* Auto CMD12 support */
 /*
  * One controller can have multiple slots, like on some omap boards using
  * omap.c controller driver. Luckily this is not currently done on any known
 	int			reqs_blocked;
 	int			use_reg;
 	int			req_in_progress;
-	unsigned int		flags;
 	struct omap_hsmmc_next	next_data;
 	struct	omap_mmc_platform_data	*pdata;
 		cmdtype = 0x3;
 	cmdreg = (cmd->opcode << 24) | (resptype << 16) | (cmdtype << 22);
-	if ((host->flags & AUTO_CMD12) && mmc_op_multi(cmd->opcode))
-		cmdreg |= ACEN_ACMD12;
 	if (data) {
 		cmdreg |= DP_SELECT | MSBS | BCE;
 	else
 		data->bytes_xfered = 0;
-	if (data->stop && ((!(host->flags & AUTO_CMD12)) || data->error)) {
+	if (!data->stop) {
-		omap_hsmmc_start_command(host, data->stop, NULL);
-	} else {
-		if (data->stop)
-			data->stop->resp[0] = OMAP_HSMMC_READ(host->base,
-							RSP76);
 		omap_hsmmc_request_done(host, data->mrq);
+		return;
 	}
+	omap_hsmmc_start_command(host, data->stop, NULL);
 }
 /*
 	host->mapbase	= res->start + pdata->reg_offset;
 	host->base	= ioremap(host->mapbase, SZ_4K);
 	host->power_mode = MMC_POWER_OFF;
-	host->flags	= AUTO_CMD12;
 	host->next_data.cookie = 1;
 	platform_set_drvdata(pdev, host);

drivers/mtd/ubi/debug.c+4−4

@@ -264,7 +264,7 @@ static struct dentry *dfs_rootdir; · 263 unmodified lines
264	*/	264	*/
265	int ubi_debugfs_init(void)	265	int ubi_debugfs_init(void)
266	{	266	{
267	if (!IS_ENABLED(DEBUG_FS))	267	if (!IS_ENABLED(CONFIG_DEBUG_FS))
268	return 0;	268	return 0;
269		269
270	dfs_rootdir = debugfs_create_dir("ubi", NULL);	270	dfs_rootdir = debugfs_create_dir("ubi", NULL);
@@ -284,7 +284,7 @@ int ubi_debugfs_init(void) · 13 unmodified lines
284	*/	284	*/
285	void ubi_debugfs_exit(void)	285	void ubi_debugfs_exit(void)
286	{	286	{
287	if (IS_ENABLED(DEBUG_FS))	287	if (IS_ENABLED(CONFIG_DEBUG_FS))
288	debugfs_remove(dfs_rootdir);	288	debugfs_remove(dfs_rootdir);
289	}	289	}
290		290
@@ -407,7 +407,7 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi) · 116 unmodified lines
407	struct dentry *dent;	407	struct dentry *dent;
408	struct ubi_debug_info *d = ubi->dbg;	408	struct ubi_debug_info *d = ubi->dbg;
409		409
410	if (!IS_ENABLED(DEBUG_FS))	410	if (!IS_ENABLED(CONFIG_DEBUG_FS))
411	return 0;	411	return 0;
412		412
413	n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME,	413	n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME,
@@ -477,6 +477,6 @@ out: · 63 unmodified lines
477	*/	477	*/
478	void ubi_debugfs_exit_dev(struct ubi_device *ubi)	478	void ubi_debugfs_exit_dev(struct ubi_device *ubi)
479	{	479	{
480	if (IS_ENABLED(DEBUG_FS))	480	if (IS_ENABLED(CONFIG_DEBUG_FS))
481	debugfs_remove_recursive(ubi->dbg->dfs_dir);	481	debugfs_remove_recursive(ubi->dbg->dfs_dir);
482	}	482	}

drivers/net/bonding/bond_procfs.c+13−2

 	}
 }
+static const char *bond_slave_link_status(s8 link)
+{
+	static const char * const status[] = {
+		[BOND_LINK_UP] = "up",
+		[BOND_LINK_FAIL] = "going down",
+		[BOND_LINK_DOWN] = "down",
+		[BOND_LINK_BACK] = "going back",
+	};
+	return status[link];
+}
 static void bond_info_show_slave(struct seq_file *seq,
 				 const struct slave *slave)
 {
 	struct bonding *bond = seq->private;
 	seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
-	seq_printf(seq, "MII Status: %s\n",
+	seq_printf(seq, "MII Status: %s\n", bond_slave_link_status(slave->link));
-		   (slave->link == BOND_LINK_UP) ?  "up" : "down");
 	if (slave->speed == SPEED_UNKNOWN)
 		seq_printf(seq, "Speed: %s\n", "Unknown");
 	else

drivers/net/caif/caif_hsi.c+3−2

 			 */
 			memcpy(rx_buf, (u8 *)piggy_desc,
 					CFHSI_DESC_SHORT_SZ);
-			/* Mark no embedded frame here */
-			piggy_desc->offset = 0;
 			if (desc_pld_len == -EPROTO)
 				goto out_of_sync;
 		}
 			/* Extract any payload in piggyback descriptor. */
 			if (cfhsi_rx_desc(piggy_desc, cfhsi) < 0)
 				goto out_of_sync;
+			/* Mark no embedded frame after extracting it */
+			piggy_desc->offset = 0;
 		}
 	}
 		dev_err(&ndev->dev, "%s: Registration error: %d.\n",
 			__func__, res);
 		free_netdev(ndev);
+		return -ENODEV;
 	}
 	/* Add CAIF HSI device to list. */
 	spin_lock(&cfhsi_list_lock);

drivers/net/can/c_can/c_can.c+2−2

@@ -590,8 +590,8 @@ static void c_can_chip_config(struct net_device *dev) · 589 unmodified lines
590	priv->write_reg(priv, &priv->regs->control,	590	priv->write_reg(priv, &priv->regs->control,
591	CONTROL_ENABLE_AR);	591	CONTROL_ENABLE_AR);
592		592
593	if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY &	593	if ((priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) &&
594	CAN_CTRLMODE_LOOPBACK)) {	594	(priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)) {
595	/* loopback + silent mode : useful for hot self-test */	595	/* loopback + silent mode : useful for hot self-test */
596	priv->write_reg(priv, &priv->regs->control, CONTROL_EIE \|	596	priv->write_reg(priv, &priv->regs->control, CONTROL_EIE \|
597	CONTROL_SIE \| CONTROL_IE \| CONTROL_TEST);	597	CONTROL_SIE \| CONTROL_IE \| CONTROL_TEST);

drivers/net/can/flexcan.c+2−2

@@ -939,12 +939,12 @@ static int __devinit flexcan_probe(struct platform_device *pdev) · 938 unmodified lines
939	return PTR_ERR(pinctrl);	939	return PTR_ERR(pinctrl);
940		940
941	if (pdev->dev.of_node) {	941	if (pdev->dev.of_node) {
942	const u32 *clock_freq_p;	942	const __be32 *clock_freq_p;
943		943
944	clock_freq_p = of_get_property(pdev->dev.of_node,	944	clock_freq_p = of_get_property(pdev->dev.of_node,
945	"clock-frequency", NULL);	945	"clock-frequency", NULL);
946	if (clock_freq_p)	946	if (clock_freq_p)
947	clock_freq = *clock_freq_p;	947	clock_freq = be32_to_cpup(clock_freq_p);
948	}	948	}
949		949
950	if (!clock_freq) {	950	if (!clock_freq) {

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c+3−5

 		if ((netif_tx_queue_stopped(txq)) &&
 		    (bp->state == BNX2X_STATE_OPEN) &&
-		    (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 3))
+		    (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 4))
 			netif_tx_wake_queue(txq);
 		__netif_tx_unlock(txq);
 /* we split the first BD into headers and data BDs
  * to ease the pain of our fellow microcode engineers
  * we use one mapping for both BDs
- * So far this has only been observed to happen
- * in Other Operating Systems(TM)
  */
 static noinline u16 bnx2x_tx_split(struct bnx2x *bp,
 				   struct bnx2x_fp_txdata *txdata,
 	txdata->tx_bd_prod += nbd;
-	if (unlikely(bnx2x_tx_avail(bp, txdata) < MAX_SKB_FRAGS + 3)) {
+	if (unlikely(bnx2x_tx_avail(bp, txdata) < MAX_SKB_FRAGS + 4)) {
 		netif_tx_stop_queue(txq);
 		/* paired memory barrier is in bnx2x_tx_int(), we have to keep
 		smp_mb();
 		fp->eth_q_stats.driver_xoff++;
-		if (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 3)
+		if (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 4)
 			netif_tx_wake_queue(txq);
 	}
 	txdata->tx_pkt++;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c+30−24

 #define I2C_BSC0			0
 #define I2C_BSC1			1
 #define I2C_WA_RETRY_CNT		3
+#define I2C_WA_PWR_ITER			(I2C_WA_RETRY_CNT - 1)
 #define MCPR_IMC_COMMAND_READ_OP	1
 #define MCPR_IMC_COMMAND_WRITE_OP	2
 	return -EINVAL;
 }
+static void bnx2x_warpcore_power_module(struct link_params *params,
+					struct bnx2x_phy *phy,
+					u8 power)
+{
+	u32 pin_cfg;
+	struct bnx2x *bp = params->bp;
+	pin_cfg = (REG_RD(bp, params->shmem_base +
+			  offsetof(struct shmem_region,
+			dev_info.port_hw_config[params->port].e3_sfp_ctrl)) &
+			PORT_HW_CFG_E3_PWR_DIS_MASK) >>
+			PORT_HW_CFG_E3_PWR_DIS_SHIFT;
+	if (pin_cfg == PIN_CFG_NA)
+		return;
+	DP(NETIF_MSG_LINK, "Setting SFP+ module power to %d using pin cfg %d\n",
+		       power, pin_cfg);
+	/* Low ==> corresponding SFP+ module is powered
+	 * high ==> the SFP+ module is powered down
+	 */
+	bnx2x_set_cfg_pin(bp, pin_cfg, power ^ 1);
+}
 static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
 						 struct link_params *params,
 						 u16 addr, u8 byte_cnt,
 	/* 4 byte aligned address */
 	addr32 = addr & (~0x3);
 	do {
+		if (cnt == I2C_WA_PWR_ITER) {
+			bnx2x_warpcore_power_module(params, phy, 0);
+			/* Note that 100us are not enough here */
+			usleep_range(1000,1000);
+			bnx2x_warpcore_power_module(params, phy, 1);
+		}
 		rc = bnx2x_bsc_read(params, phy, 0xa0, addr32, 0, byte_cnt,
 				    data_array);
 	} while ((rc != 0) && (++cnt < I2C_WA_RETRY_CNT));
 		bnx2x_set_e1e2_module_fault_led(params, gpio_mode);
 }
-static void bnx2x_warpcore_power_module(struct link_params *params,
-					struct bnx2x_phy *phy,
-					u8 power)
-{
-	u32 pin_cfg;
-	struct bnx2x *bp = params->bp;
-	pin_cfg = (REG_RD(bp, params->shmem_base +
-			  offsetof(struct shmem_region,
-			dev_info.port_hw_config[params->port].e3_sfp_ctrl)) &
-			PORT_HW_CFG_E3_PWR_DIS_MASK) >>
-			PORT_HW_CFG_E3_PWR_DIS_SHIFT;
-	if (pin_cfg == PIN_CFG_NA)
-		return;
-	DP(NETIF_MSG_LINK, "Setting SFP+ module power to %d using pin cfg %d\n",
-		       power, pin_cfg);
-	/* Low ==> corresponding SFP+ module is powered
-	 * high ==> the SFP+ module is powered down
-	 */
-	bnx2x_set_cfg_pin(bp, pin_cfg, power ^ 1);
-}
 static void bnx2x_warpcore_hw_reset(struct bnx2x_phy *phy,
 				    struct link_params *params)
 {
 	msleep(1);
-	if (!(CHIP_IS_E1(bp)))
+	if (!(CHIP_IS_E1x(bp)))
 		port = BP_PATH(bp);
 	else
 		port = params->port;

drivers/net/ethernet/emulex/benet/be_cmds.c+6−6

@@ -122,15 +122,15 @@ static int be_mcc_compl_process(struct be_adapter *adapter, · 121 unmodified lines
122	goto done;	122	goto done;
123		123
124	if (compl_status == MCC_STATUS_UNAUTHORIZED_REQUEST) {	124	if (compl_status == MCC_STATUS_UNAUTHORIZED_REQUEST) {
125	dev_warn(&adapter->pdev->dev, "This domain(VM) is not "	125	dev_warn(&adapter->pdev->dev,
126	"permitted to execute this cmd (opcode %d)\n",	126	"opcode %d-%d is not permitted\n",
127	opcode);	127	opcode, subsystem);
128	} else {	128	} else {
129	extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &	129	extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
130	CQE_STATUS_EXTD_MASK;	130	CQE_STATUS_EXTD_MASK;
131	dev_err(&adapter->pdev->dev, "Cmd (opcode %d) failed:"	131	dev_err(&adapter->pdev->dev,
132	"status %d, extd-status %d\n",	132	"opcode %d-%d failed:status %d-%d\n",
133	opcode, compl_status, extd_status);	133	opcode, subsystem, compl_status, extd_status);
134	}	134	}
135	}	135	}
136	done:	136	done:

drivers/net/ethernet/emulex/benet/be_cmds.h+1−1

@@ -1566,7 +1566,7 @@ struct be_hw_stats_v1 { · 1565 unmodified lines
1566	u32 rsvd0[BE_TXP_SW_SZ];	1566	u32 rsvd0[BE_TXP_SW_SZ];
1567	struct be_erx_stats_v1 erx;	1567	struct be_erx_stats_v1 erx;
1568	struct be_pmem_stats pmem;	1568	struct be_pmem_stats pmem;
1569	u32 rsvd1[3];	1569	u32 rsvd1[18];
1570	};	1570	};
1571		1571
1572	struct be_cmd_req_get_stats_v1 {	1572	struct be_cmd_req_get_stats_v1 {

drivers/net/ethernet/emulex/benet/be_main.c+1−1

@@ -3237,7 +3237,7 @@ static void be_netdev_init(struct net_device *netdev) · 3236 unmodified lines
3237		3237
3238	netdev->flags \|= IFF_MULTICAST;	3238	netdev->flags \|= IFF_MULTICAST;
3239		3239
3240	netif_set_gso_max_size(netdev, 65535);	3240	netif_set_gso_max_size(netdev, 65535 - ETH_HLEN);
3241		3241
3242	netdev->netdev_ops = &be_netdev_ops;	3242	netdev->netdev_ops = &be_netdev_ops;
3243		3243

drivers/net/ethernet/intel/Kconfig+7−3

 config IGB_PTP
 	bool "PTP Hardware Clock (PHC)"
-	default y
+	default n
-	depends on IGB && PTP_1588_CLOCK
+	depends on IGB && EXPERIMENTAL
+	select PPS
+	select PTP_1588_CLOCK
 	---help---
 	  Say Y here if you want to use PTP Hardware Clock (PHC) in the
 	  driver.  Only the basic clock operations have been implemented.
 config IXGBE_PTP
 	bool "PTP Clock Support"
 	default n
-	depends on IXGBE && PTP_1588_CLOCK
+	depends on IXGBE && EXPERIMENTAL
+	select PPS
+	select PTP_1588_CLOCK
 	---help---
 	  Say Y here if you want support for 1588 Timestamping with a
 	  PHC device, using the PTP 1588 Clock support. This is

drivers/net/ethernet/intel/igb/e1000_82575.c+0−2

 		mac->rar_entry_count = E1000_RAR_ENTRIES_82580;
 		break;
 	case e1000_i350:
-	case e1000_i210:
-	case e1000_i211:
 		mac->rar_entry_count = E1000_RAR_ENTRIES_I350;
 		break;
 	default:

drivers/net/ethernet/intel/ixgbe/ixgbe.h+2−2

@@ -196,7 +196,7 @@ enum ixgbe_ring_state_t { · 195 unmodified lines
196	__IXGBE_HANG_CHECK_ARMED,	196	__IXGBE_HANG_CHECK_ARMED,
197	__IXGBE_RX_RSC_ENABLED,	197	__IXGBE_RX_RSC_ENABLED,
198	__IXGBE_RX_CSUM_UDP_ZERO_ERR,	198	__IXGBE_RX_CSUM_UDP_ZERO_ERR,
199	__IXGBE_RX_FCOE_BUFSZ,	199	__IXGBE_RX_FCOE,
200	};	200	};
201		201
202	#define check_for_tx_hang(ring) \	202	#define check_for_tx_hang(ring) \
@@ -290,7 +290,7 @@ struct ixgbe_ring_feature { · 87 unmodified lines
290	#if defined(IXGBE_FCOE) && (PAGE_SIZE < 8192)	290	#if defined(IXGBE_FCOE) && (PAGE_SIZE < 8192)
291	static inline unsigned int ixgbe_rx_pg_order(struct ixgbe_ring *ring)	291	static inline unsigned int ixgbe_rx_pg_order(struct ixgbe_ring *ring)
292	{	292	{
293	return test_bit(__IXGBE_RX_FCOE_BUFSZ, &ring->state) ? 1 : 0;	293	return test_bit(__IXGBE_RX_FCOE, &ring->state) ? 1 : 0;
294	}	294	}
295	#else	295	#else
296	#define ixgbe_rx_pg_order(_ring) 0	296	#define ixgbe_rx_pg_order(_ring) 0

drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c+1−1

@@ -634,7 +634,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, · 633 unmodified lines
634	f = &adapter->ring_feature[RING_F_FCOE];	634	f = &adapter->ring_feature[RING_F_FCOE];
635	if ((rxr_idx >= f->mask) &&	635	if ((rxr_idx >= f->mask) &&
636	(rxr_idx < f->mask + f->indices))	636	(rxr_idx < f->mask + f->indices))
637	set_bit(__IXGBE_RX_FCOE_BUFSZ, &ring->state);	637	set_bit(__IXGBE_RX_FCOE, &ring->state);
638	}	638	}
639		639
640	#endif /* IXGBE_FCOE */	640	#endif /* IXGBE_FCOE */

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c+11−5

 #ifdef IXGBE_FCOE
 /**
  * ixgbe_rx_is_fcoe - check the rx desc for incoming pkt type
- * @adapter: address of board private structure
+ * @ring: structure containing ring specific data
  * @rx_desc: advanced rx descriptor
  *
  * Returns : true if it is FCoE pkt
  */
-static inline bool ixgbe_rx_is_fcoe(struct ixgbe_adapter *adapter,
+static inline bool ixgbe_rx_is_fcoe(struct ixgbe_ring *ring,
 				    union ixgbe_adv_rx_desc *rx_desc)
 {
 	__le16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
-	return (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&
+	return test_bit(__IXGBE_RX_FCOE, &ring->state) &&
 	       ((pkt_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_ETQF_MASK)) ==
 		(cpu_to_le16(IXGBE_ETQF_FILTER_FCOE <<
 			     IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT)));
 	/* alloc new page for storage */
 	if (likely(!page)) {
-		page = alloc_pages(GFP_ATOMIC | __GFP_COLD,
+		page = alloc_pages(GFP_ATOMIC | __GFP_COLD | __GFP_COMP,
 				   ixgbe_rx_pg_order(rx_ring));
 		if (unlikely(!page)) {
 			rx_ring->rx_stats.alloc_rx_page_failed++;
 		skb->truesize -= ixgbe_rx_bufsz(rx_ring);
 	}
+#ifdef IXGBE_FCOE
+	/* do not attempt to pad FCoE Frames as this will disrupt DDP */
+	if (ixgbe_rx_is_fcoe(rx_ring, rx_desc))
+		return false;
+#endif
 	/* if skb_pad returns an error the skb was freed */
 	if (unlikely(skb->len < 60)) {
 		int pad_len = 60 - skb->len;
 #ifdef IXGBE_FCOE
 		/* if ddp, not passing to ULD unless for FCP_RSP or error */
-		if (ixgbe_rx_is_fcoe(adapter, rx_desc)) {
+		if (ixgbe_rx_is_fcoe(rx_ring, rx_desc)) {
 			ddp_bytes = ixgbe_fcoe_ddp(adapter, rx_desc, skb);
 			if (!ddp_bytes) {
 				dev_kfree_skb_any(skb);

drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c+11−2

 {
 	struct ixgbe_hw *hw = &adapter->hw;
 	u32 incval = 0;
+	u32 timinca = 0;
 	u32 shift = 0;
 	u32 cycle_speed;
 	unsigned long flags;
 		break;
 	}
-	/* Bail if the cycle speed didn't change */
+	/*
-	if (adapter->cycle_speed == cycle_speed)
+	 * grab the current TIMINCA value from the register so that it can be
+	 * double checked. If the register value has been cleared, it must be
+	 * reset to the correct value for generating a cyclecounter. If
+	 * TIMINCA is zero, the SYSTIME registers do not increment at all.
+	 */
+	timinca = IXGBE_READ_REG(hw, IXGBE_TIMINCA);
+	/* Bail if the cycle speed didn't change and TIMINCA is non-zero */
+	if (adapter->cycle_speed == cycle_speed && timinca)
 		return;
 	/* disable the SDP clock out */

drivers/net/ethernet/mellanox/mlx4/en_netdev.c+12−6

 		if (priv->rx_cq[i].buf)
 			mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);
 	}
+	if (priv->base_tx_qpn) {
+		mlx4_qp_release_range(priv->mdev->dev, priv->base_tx_qpn, priv->tx_ring_num);
+		priv->base_tx_qpn = 0;
+	}
 }
 int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
 {
 	struct mlx4_en_port_profile *prof = priv->prof;
 	int i;
-	int base_tx_qpn, err;
+	int err;
-	err = mlx4_qp_reserve_range(priv->mdev->dev, priv->tx_ring_num, 256, &base_tx_qpn);
+	err = mlx4_qp_reserve_range(priv->mdev->dev, priv->tx_ring_num, 256, &priv->base_tx_qpn);
 	if (err) {
 		en_err(priv, "failed reserving range for TX rings\n");
 		return err;
 				      prof->tx_ring_size, i, TX))
 			goto err;
-		if (mlx4_en_create_tx_ring(priv, &priv->tx_ring[i], base_tx_qpn + i,
+		if (mlx4_en_create_tx_ring(priv, &priv->tx_ring[i], priv->base_tx_qpn + i,
 					   prof->tx_ring_size, TXBB_SIZE))
 			goto err;
 	}
 err:
 	en_err(priv, "Failed to allocate NIC resources\n");
-	mlx4_qp_release_range(priv->mdev->dev, base_tx_qpn, priv->tx_ring_num);
 	return -ENOMEM;
 }
 	en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
 	/* Configure port */
+	mlx4_en_calc_rx_buf(dev);
 	err = mlx4_SET_PORT_general(mdev->dev, priv->port,
-				    MLX4_EN_MIN_MTU,
+				    priv->rx_skb_size + ETH_FCS_LEN,
-				    0, 0, 0, 0);
+				    prof->tx_pause, prof->tx_ppp,
+				    prof->rx_pause, prof->rx_ppp);
 	if (err) {
 		en_err(priv, "Failed setting port general configurations "
 		       "for port %d, with error %d\n", priv->port, err);

drivers/net/ethernet/mellanox/mlx4/main.c+2−0

 	if (err == -EBUSY && (dev->flags & MLX4_FLAG_MSI_X) &&
 	    !mlx4_is_mfunc(dev)) {
 		dev->flags &= ~MLX4_FLAG_MSI_X;
+		dev->caps.num_comp_vectors = 1;
+		dev->caps.comp_pool	   = 0;
 		pci_disable_msix(pdev);
 		err = mlx4_setup_hca(dev);
 	}

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h+1−0

@@ -495,6 +495,7 @@ struct mlx4_en_priv { · 494 unmodified lines
495	int vids[128];	495	int vids[128];
496	bool wol;	496	bool wol;
497	struct device *ddev;	497	struct device *ddev;
		498	int base_tx_qpn;
498		499
499	#ifdef CONFIG_MLX4_EN_DCB	500	#ifdef CONFIG_MLX4_EN_DCB
500	struct ieee_ets ets;	501	struct ieee_ets ets;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c+1−1

@@ -479,7 +479,7 @@ qlcnic_init_pci_info(struct qlcnic_adapter *adapter) · 478 unmodified lines
479		479
480	for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {	480	for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
481	pfn = pci_info[i].id;	481	pfn = pci_info[i].id;
482	if (pfn > QLCNIC_MAX_PCI_FUNC) {	482	if (pfn >= QLCNIC_MAX_PCI_FUNC) {
483	ret = QL_STATUS_INVALID_PARAM;	483	ret = QL_STATUS_INVALID_PARAM;
484	goto err_eswitch;	484	goto err_eswitch;
485	}	485	}

drivers/net/ethernet/realtek/r8169.c+1−0

@@ -3894,6 +3894,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp) · 3893 unmodified lines
3894	case RTL_GIGA_MAC_VER_22:	3894	case RTL_GIGA_MAC_VER_22:
3895	case RTL_GIGA_MAC_VER_23:	3895	case RTL_GIGA_MAC_VER_23:
3896	case RTL_GIGA_MAC_VER_24:	3896	case RTL_GIGA_MAC_VER_24:
		3897	case RTL_GIGA_MAC_VER_34:
3897	RTL_W32(RxConfig, RX128_INT_EN \| RX_MULTI_EN \| RX_DMA_BURST);	3898	RTL_W32(RxConfig, RX128_INT_EN \| RX_MULTI_EN \| RX_DMA_BURST);
3898	break;	3899	break;
3899	default:	3900	default:

drivers/net/ethernet/renesas/sh_eth.c+7−5

 }
 /* Packet receive function */
-static int sh_eth_rx(struct net_device *ndev)
+static int sh_eth_rx(struct net_device *ndev, u32 intr_status)
 {
 	struct sh_eth_private *mdp = netdev_priv(ndev);
 	struct sh_eth_rxdesc *rxdesc;
 	/* Restart Rx engine if stopped. */
 	/* If we don't need to check status, don't. -KDU */
 	if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) {
-		/* fix the values for the next receiving */
+		/* fix the values for the next receiving if RDE is set */
-		mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) -
+		if (intr_status & EESR_RDE)
-					       sh_eth_read(ndev, RDLAR)) >> 4;
+			mdp->cur_rx = mdp->dirty_rx =
+				(sh_eth_read(ndev, RDFAR) -
+				 sh_eth_read(ndev, RDLAR)) >> 4;
 		sh_eth_write(ndev, EDRRR_R, EDRRR);
 	}
 			EESR_RTSF | /* short frame recv */
 			EESR_PRE  | /* PHY-LSI recv error */
 			EESR_CERF)){ /* recv frame CRC error */
-		sh_eth_rx(ndev);
+		sh_eth_rx(ndev, intr_status);
 	}
 	/* Tx Check */

drivers/net/phy/micrel.c+4−4

@@ -161,7 +161,7 @@ static struct phy_driver ks8051_driver = { · 160 unmodified lines
161	static struct phy_driver ks8001_driver = {	161	static struct phy_driver ks8001_driver = {
162	.phy_id = PHY_ID_KS8001,	162	.phy_id = PHY_ID_KS8001,
163	.name = "Micrel KS8001 or KS8721",	163	.name = "Micrel KS8001 or KS8721",
164	.phy_id_mask = 0x00fffff0,	164	.phy_id_mask = 0x00ffffff,
165	.features = (PHY_BASIC_FEATURES \| SUPPORTED_Pause),	165	.features = (PHY_BASIC_FEATURES \| SUPPORTED_Pause),
166	.flags = PHY_HAS_MAGICANEG \| PHY_HAS_INTERRUPT,	166	.flags = PHY_HAS_MAGICANEG \| PHY_HAS_INTERRUPT,
167	.config_init = kszphy_config_init,	167	.config_init = kszphy_config_init,
@@ -174,7 +174,7 @@ static struct phy_driver ks8001_driver = { · 6 unmodified lines
174		174
175	static struct phy_driver ksz9021_driver = {	175	static struct phy_driver ksz9021_driver = {
176	.phy_id = PHY_ID_KSZ9021,	176	.phy_id = PHY_ID_KSZ9021,
177	.phy_id_mask = 0x000fff10,	177	.phy_id_mask = 0x000ffffe,
178	.name = "Micrel KSZ9021 Gigabit PHY",	178	.name = "Micrel KSZ9021 Gigabit PHY",
179	.features = (PHY_GBIT_FEATURES \| SUPPORTED_Pause	179	.features = (PHY_GBIT_FEATURES \| SUPPORTED_Pause
180	\| SUPPORTED_Asym_Pause),	180	\| SUPPORTED_Asym_Pause),
@@ -240,8 +240,8 @@ MODULE_AUTHOR("David J. Choi"); · 59 unmodified lines
240	MODULE_LICENSE("GPL");	240	MODULE_LICENSE("GPL");
241		241
242	static struct mdio_device_id __maybe_unused micrel_tbl[] = {	242	static struct mdio_device_id __maybe_unused micrel_tbl[] = {
243	{ PHY_ID_KSZ9021, 0x000fff10 },	243	{ PHY_ID_KSZ9021, 0x000ffffe },
244	{ PHY_ID_KS8001, 0x00fffff0 },	244	{ PHY_ID_KS8001, 0x00ffffff },
245	{ PHY_ID_KS8737, 0x00fffff0 },	245	{ PHY_ID_KS8737, 0x00fffff0 },
246	{ PHY_ID_KS8041, 0x00fffff0 },	246	{ PHY_ID_KS8041, 0x00fffff0 },
247	{ PHY_ID_KS8051, 0x00fffff0 },	247	{ PHY_ID_KS8051, 0x00fffff0 },

drivers/net/usb/ipheth.c+5−0

 #define USB_PRODUCT_IPHONE_3G   0x1292
 #define USB_PRODUCT_IPHONE_3GS  0x1294
 #define USB_PRODUCT_IPHONE_4	0x1297
+#define USB_PRODUCT_IPAD 0x129a
 #define USB_PRODUCT_IPHONE_4_VZW 0x129c
 #define USB_PRODUCT_IPHONE_4S	0x12a0
 		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4,
 		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 		IPHETH_USBINTF_PROTO) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(
+		USB_VENDOR_APPLE, USB_PRODUCT_IPAD,
+		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+		IPHETH_USBINTF_PROTO) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(
 		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,
 		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,

drivers/net/usb/qmi_wwan.c+40−43

@@ -257,29 +257,6 @@ err: · 256 unmodified lines
257	return rv;	257	return rv;
258	}	258	}
259		259
260	/* Gobi devices uses identical class/protocol codes for all interfaces regardless
261	* of function. Some of these are CDC ACM like and have the exact same endpoints
262	* we are looking for. This leaves two possible strategies for identifying the
263	* correct interface:
264	* a) hardcoding interface number, or
265	* b) use the fact that the wwan interface is the only one lacking additional
266	* (CDC functional) descriptors
267	*
268	* Let's see if we can get away with the generic b) solution.
269	*/
270	static int qmi_wwan_bind_gobi(struct usbnet dev, struct usb_interface intf)
271	{
272	int rv = -EINVAL;
273
274	/* ignore any interface with additional descriptors */
275	if (intf->cur_altsetting->extralen)
276	goto err;
277
278	rv = qmi_wwan_bind_shared(dev, intf);
279	err:
280	return rv;
281	}
282
283	static void qmi_wwan_unbind_shared(struct usbnet dev, struct usb_interface intf)	260	static void qmi_wwan_unbind_shared(struct usbnet dev, struct usb_interface intf)
284	{	261	{
285	struct usb_driver subdriver = (void )dev->data[0];	262	struct usb_driver subdriver = (void )dev->data[0];
@@ -347,15 +324,15 @@ static const struct driver_info qmi_wwan_shared = { · 61 unmodified lines
347	.manage_power = qmi_wwan_manage_power,	324	.manage_power = qmi_wwan_manage_power,
348	};	325	};
349		326
350	static const struct driver_info qmi_wwan_gobi = {	327	static const struct driver_info qmi_wwan_force_int0 = {
351	.description = "Qualcomm Gobi wwan/QMI device",	328	.description = "Qualcomm WWAN/QMI device",
352	.flags = FLAG_WWAN,	329	.flags = FLAG_WWAN,
353	.bind = qmi_wwan_bind_gobi,	330	.bind = qmi_wwan_bind_shared,
354	.unbind = qmi_wwan_unbind_shared,	331	.unbind = qmi_wwan_unbind_shared,
355	.manage_power = qmi_wwan_manage_power,	332	.manage_power = qmi_wwan_manage_power,
		333	.data = BIT(0), /* interface whitelist bitmap */
356	};	334	};
357		335
358	/* ZTE suck at making USB descriptors */
359	static const struct driver_info qmi_wwan_force_int1 = {	336	static const struct driver_info qmi_wwan_force_int1 = {
360	.description = "Qualcomm WWAN/QMI device",	337	.description = "Qualcomm WWAN/QMI device",
361	.flags = FLAG_WWAN,	338	.flags = FLAG_WWAN,
@@ -365,6 +342,15 @@ static const struct driver_info qmi_wwan_force_int1 = { · 3 unmodified lines
365	.data = BIT(1), /* interface whitelist bitmap */	342	.data = BIT(1), /* interface whitelist bitmap */
366	};	343	};
367		344
		345	static const struct driver_info qmi_wwan_force_int3 = {
		346	.description = "Qualcomm WWAN/QMI device",
		347	.flags = FLAG_WWAN,
		348	.bind = qmi_wwan_bind_shared,
		349	.unbind = qmi_wwan_unbind_shared,
		350	.manage_power = qmi_wwan_manage_power,
		351	.data = BIT(3), /* interface whitelist bitmap */
		352	};
		353
368	static const struct driver_info qmi_wwan_force_int4 = {	354	static const struct driver_info qmi_wwan_force_int4 = {
369	.description = "Qualcomm WWAN/QMI device",	355	.description = "Qualcomm WWAN/QMI device",
370	.flags = FLAG_WWAN,	356	.flags = FLAG_WWAN,
@@ -390,16 +376,23 @@ static const struct driver_info qmi_wwan_force_int4 = { · 19 unmodified lines
390	static const struct driver_info qmi_wwan_sierra = {	376	static const struct driver_info qmi_wwan_sierra = {
391	.description = "Sierra Wireless wwan/QMI device",	377	.description = "Sierra Wireless wwan/QMI device",
392	.flags = FLAG_WWAN,	378	.flags = FLAG_WWAN,
393	.bind = qmi_wwan_bind_gobi,	379	.bind = qmi_wwan_bind_shared,
394	.unbind = qmi_wwan_unbind_shared,	380	.unbind = qmi_wwan_unbind_shared,
395	.manage_power = qmi_wwan_manage_power,	381	.manage_power = qmi_wwan_manage_power,
396	.data = BIT(8) \| BIT(19), /* interface whitelist bitmap */	382	.data = BIT(8) \| BIT(19), /* interface whitelist bitmap */
397	};	383	};
398		384
399	#define HUAWEI_VENDOR_ID 0x12D1	385	#define HUAWEI_VENDOR_ID 0x12D1
		386
		387	/* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */
		388	#define QMI_GOBI1K_DEVICE(vend, prod) \
		389	USB_DEVICE(vend, prod), \
		390	.driver_info = (unsigned long)&qmi_wwan_force_int3
		391
		392	/* Gobi 2000 and Gobi 3000 QMI/wwan interface number is 0 according to qcserial */
400	#define QMI_GOBI_DEVICE(vend, prod) \	393	#define QMI_GOBI_DEVICE(vend, prod) \
401	USB_DEVICE(vend, prod), \	394	USB_DEVICE(vend, prod), \
402	.driver_info = (unsigned long)&qmi_wwan_gobi	395	.driver_info = (unsigned long)&qmi_wwan_force_int0
403		396
404	static const struct usb_device_id products[] = {	397	static const struct usb_device_id products[] = {
405	{ /* Huawei E392, E398 and possibly others sharing both device id and more... */	398	{ /* Huawei E392, E398 and possibly others sharing both device id and more... */
@@ -510,20 +503,24 @@ static const struct usb_device_id products[] = { · 104 unmodified lines
510	.bInterfaceProtocol = 0xff,	503	.bInterfaceProtocol = 0xff,
511	.driver_info = (unsigned long)&qmi_wwan_sierra,	504	.driver_info = (unsigned long)&qmi_wwan_sierra,
512	},	505	},
513	{QMI_GOBI_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */	506
514	{QMI_GOBI_DEVICE(0x03f0, 0x1f1d)}, /* HP un2400 Gobi Modem Device */	507	/* Gobi 1000 devices */
515	{QMI_GOBI_DEVICE(0x03f0, 0x371d)}, /* HP un2430 Mobile Broadband Module */	508	{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
516	{QMI_GOBI_DEVICE(0x04da, 0x250d)}, /* Panasonic Gobi Modem device */	509	{QMI_GOBI1K_DEVICE(0x03f0, 0x1f1d)}, /* HP un2400 Gobi Modem Device */
517	{QMI_GOBI_DEVICE(0x413c, 0x8172)}, /* Dell Gobi Modem device */	510	{QMI_GOBI1K_DEVICE(0x03f0, 0x371d)}, /* HP un2430 Mobile Broadband Module */
518	{QMI_GOBI_DEVICE(0x1410, 0xa001)}, /* Novatel Gobi Modem device */	511	{QMI_GOBI1K_DEVICE(0x04da, 0x250d)}, /* Panasonic Gobi Modem device */
519	{QMI_GOBI_DEVICE(0x0b05, 0x1776)}, /* Asus Gobi Modem device */	512	{QMI_GOBI1K_DEVICE(0x413c, 0x8172)}, /* Dell Gobi Modem device */
520	{QMI_GOBI_DEVICE(0x19d2, 0xfff3)}, /* ONDA Gobi Modem device */	513	{QMI_GOBI1K_DEVICE(0x1410, 0xa001)}, /* Novatel Gobi Modem device */
521	{QMI_GOBI_DEVICE(0x05c6, 0x9001)}, /* Generic Gobi Modem device */	514	{QMI_GOBI1K_DEVICE(0x0b05, 0x1776)}, /* Asus Gobi Modem device */
522	{QMI_GOBI_DEVICE(0x05c6, 0x9002)}, /* Generic Gobi Modem device */	515	{QMI_GOBI1K_DEVICE(0x19d2, 0xfff3)}, /* ONDA Gobi Modem device */
523	{QMI_GOBI_DEVICE(0x05c6, 0x9202)}, /* Generic Gobi Modem device */	516	{QMI_GOBI1K_DEVICE(0x05c6, 0x9001)}, /* Generic Gobi Modem device */
524	{QMI_GOBI_DEVICE(0x05c6, 0x9203)}, /* Generic Gobi Modem device */	517	{QMI_GOBI1K_DEVICE(0x05c6, 0x9002)}, /* Generic Gobi Modem device */
525	{QMI_GOBI_DEVICE(0x05c6, 0x9222)}, /* Generic Gobi Modem device */	518	{QMI_GOBI1K_DEVICE(0x05c6, 0x9202)}, /* Generic Gobi Modem device */
526	{QMI_GOBI_DEVICE(0x05c6, 0x9009)}, /* Generic Gobi Modem device */	519	{QMI_GOBI1K_DEVICE(0x05c6, 0x9203)}, /* Generic Gobi Modem device */
		520	{QMI_GOBI1K_DEVICE(0x05c6, 0x9222)}, /* Generic Gobi Modem device */
		521	{QMI_GOBI1K_DEVICE(0x05c6, 0x9009)}, /* Generic Gobi Modem device */
		522
		523	/* Gobi 2000 and 3000 devices */
527	{QMI_GOBI_DEVICE(0x413c, 0x8186)}, /* Dell Gobi 2000 Modem device (N0218, VU936) */	524	{QMI_GOBI_DEVICE(0x413c, 0x8186)}, /* Dell Gobi 2000 Modem device (N0218, VU936) */
528	{QMI_GOBI_DEVICE(0x05c6, 0x920b)}, /* Generic Gobi 2000 Modem device */	525	{QMI_GOBI_DEVICE(0x05c6, 0x920b)}, /* Generic Gobi 2000 Modem device */
529	{QMI_GOBI_DEVICE(0x05c6, 0x9225)}, /* Sony Gobi 2000 Modem device (N0279, VU730) */	526	{QMI_GOBI_DEVICE(0x05c6, 0x9225)}, /* Sony Gobi 2000 Modem device (N0279, VU730) */

drivers/net/usb/usbnet.c+33−20

@@ -796,11 +796,13 @@ int usbnet_open (struct net_device *net) · 795 unmodified lines
796	if (info->manage_power) {	796	if (info->manage_power) {
797	retval = info->manage_power(dev, 1);	797	retval = info->manage_power(dev, 1);
798	if (retval < 0)	798	if (retval < 0)
799	goto done;	799	goto done_manage_power_error;
800	usb_autopm_put_interface(dev->intf);	800	usb_autopm_put_interface(dev->intf);
801	}	801	}
802	return retval;	802	return retval;
803		803
		804	done_manage_power_error:
		805	clear_bit(EVENT_DEV_OPEN, &dev->flags);
804	done:	806	done:
805	usb_autopm_put_interface(dev->intf);	807	usb_autopm_put_interface(dev->intf);
806	done_nopm:	808	done_nopm:
@@ -876,9 +878,9 @@ void usbnet_get_drvinfo (struct net_device net, struct ethtool_drvinfo info) · 69 unmodified lines
876	{	878	{
877	struct usbnet *dev = netdev_priv(net);	879	struct usbnet *dev = netdev_priv(net);
878		880
879	strncpy (info->driver, dev->driver_name, sizeof info->driver);	881	strlcpy (info->driver, dev->driver_name, sizeof info->driver);
880	strncpy (info->version, DRIVER_VERSION, sizeof info->version);	882	strlcpy (info->version, DRIVER_VERSION, sizeof info->version);
881	strncpy (info->fw_version, dev->driver_info->description,	883	strlcpy (info->fw_version, dev->driver_info->description,
882	sizeof info->fw_version);	884	sizeof info->fw_version);
883	usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info);	885	usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info);
884	}	886	}
@@ -1202,6 +1204,21 @@ deferred: · 317 unmodified lines
1202	}	1204	}
1203	EXPORT_SYMBOL_GPL(usbnet_start_xmit);	1205	EXPORT_SYMBOL_GPL(usbnet_start_xmit);
1204		1206
		1207	static void rx_alloc_submit(struct usbnet *dev, gfp_t flags)
		1208	{
		1209	struct urb *urb;
		1210	int i;
		1211
		1212	/* don't refill the queue all at once */
		1213	for (i = 0; i < 10 && dev->rxq.qlen < RX_QLEN(dev); i++) {
		1214	urb = usb_alloc_urb(0, flags);
		1215	if (urb != NULL) {
		1216	if (rx_submit(dev, urb, flags) == -ENOLINK)
		1217	return;
		1218	}
		1219	}
		1220	}
		1221
1205	/-------------------------------------------------------------------------/	1222	/-------------------------------------------------------------------------/
1206		1223
1207	// tasklet (work deferred from completions, in_irq) or timer	1224	// tasklet (work deferred from completions, in_irq) or timer
@@ -1241,26 +1258,14 @@ static void usbnet_bh (unsigned long param) · 33 unmodified lines
1241	!timer_pending (&dev->delay) &&	1258	!timer_pending (&dev->delay) &&
1242	!test_bit (EVENT_RX_HALT, &dev->flags)) {	1259	!test_bit (EVENT_RX_HALT, &dev->flags)) {
1243	int temp = dev->rxq.qlen;	1260	int temp = dev->rxq.qlen;
1244	int qlen = RX_QLEN (dev);	1261
1245		1262	if (temp < RX_QLEN(dev)) {
1246	if (temp < qlen) {	1263	rx_alloc_submit(dev, GFP_ATOMIC);
1247	struct urb *urb;
1248	int i;
1249
1250	// don't refill the queue all at once
1251	for (i = 0; i < 10 && dev->rxq.qlen < qlen; i++) {
1252	urb = usb_alloc_urb (0, GFP_ATOMIC);
1253	if (urb != NULL) {
1254	if (rx_submit (dev, urb, GFP_ATOMIC) ==
1255	-ENOLINK)
1256	return;
1257	}
1258	}
1259	if (temp != dev->rxq.qlen)	1264	if (temp != dev->rxq.qlen)
1260	netif_dbg(dev, link, dev->net,	1265	netif_dbg(dev, link, dev->net,
1261	"rxqlen %d --> %d\n",	1266	"rxqlen %d --> %d\n",
1262	temp, dev->rxq.qlen);	1267	temp, dev->rxq.qlen);
1263	if (dev->rxq.qlen < qlen)	1268	if (dev->rxq.qlen < RX_QLEN(dev))
1264	tasklet_schedule (&dev->bh);	1269	tasklet_schedule (&dev->bh);
1265	}	1270	}
1266	if (dev->txq.qlen < TX_QLEN (dev))	1271	if (dev->txq.qlen < TX_QLEN (dev))
@@ -1513,6 +1518,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message) · 246 unmodified lines
1513	spin_lock_irq(&dev->txq.lock);	1518	spin_lock_irq(&dev->txq.lock);
1514	/* don't autosuspend while transmitting */	1519	/* don't autosuspend while transmitting */
1515	if (dev->txq.qlen && PMSG_IS_AUTO(message)) {	1520	if (dev->txq.qlen && PMSG_IS_AUTO(message)) {
		1521	dev->suspend_count--;
1516	spin_unlock_irq(&dev->txq.lock);	1522	spin_unlock_irq(&dev->txq.lock);
1517	return -EBUSY;	1523	return -EBUSY;
1518	} else {	1524	} else {
@@ -1569,6 +1575,13 @@ int usbnet_resume (struct usb_interface *intf) · 50 unmodified lines
1569	spin_unlock_irq(&dev->txq.lock);	1575	spin_unlock_irq(&dev->txq.lock);
1570		1576
1571	if (test_bit(EVENT_DEV_OPEN, &dev->flags)) {	1577	if (test_bit(EVENT_DEV_OPEN, &dev->flags)) {
		1578	/* handle remote wakeup ASAP */
		1579	if (!dev->wait &&
		1580	netif_device_present(dev->net) &&
		1581	!timer_pending(&dev->delay) &&
		1582	!test_bit(EVENT_RX_HALT, &dev->flags))
		1583	rx_alloc_submit(dev, GFP_KERNEL);
		1584
1572	if (!(dev->txq.qlen >= TX_QLEN(dev)))	1585	if (!(dev->txq.qlen >= TX_QLEN(dev)))
1573	netif_tx_wake_all_queues(dev->net);	1586	netif_tx_wake_all_queues(dev->net);
1574	tasklet_schedule (&dev->bh);	1587	tasklet_schedule (&dev->bh);

drivers/net/wireless/airo.c+2−2

@@ -7233,8 +7233,8 @@ static int airo_get_aplist(struct net_device *dev, · 7232 unmodified lines
7233	}	7233	}
7234	} else {	7234	} else {
7235	dwrq->flags = 1; /* Should be define'd */	7235	dwrq->flags = 1; /* Should be define'd */
7236	memcpy(extra + sizeof(struct sockaddr)*i,	7236	memcpy(extra + sizeof(struct sockaddr) * i, qual,
7237	&qual, sizeof(struct iw_quality)*i);	7237	sizeof(struct iw_quality) * i);
7238	}	7238	}
7239	dwrq->length = i;	7239	dwrq->length = i;
7240		7240

drivers/net/wireless/ath/ath5k/base.c+2−2

@@ -1045,11 +1045,11 @@ ath5k_drain_tx_buffs(struct ath5k_hw *ah) · 1044 unmodified lines
1045		1045
1046	ath5k_txbuf_free_skb(ah, bf);	1046	ath5k_txbuf_free_skb(ah, bf);
1047		1047
1048	spin_lock_bh(&ah->txbuflock);	1048	spin_lock(&ah->txbuflock);
1049	list_move_tail(&bf->list, &ah->txbuf);	1049	list_move_tail(&bf->list, &ah->txbuf);
1050	ah->txbuf_len++;	1050	ah->txbuf_len++;
1051	txq->txq_len--;	1051	txq->txq_len--;
1052	spin_unlock_bh(&ah->txbuflock);	1052	spin_unlock(&ah->txbuflock);
1053	}	1053	}
1054	txq->link = NULL;	1054	txq->link = NULL;
1055	txq->txq_poll_mark = false;	1055	txq->txq_poll_mark = false;

drivers/net/wireless/ath/ath9k/ath9k.h+1−0

@@ -214,6 +214,7 @@ struct ath_frame_info { · 213 unmodified lines
214	enum ath9k_key_type keytype;	214	enum ath9k_key_type keytype;
215	u8 keyix;	215	u8 keyix;
216	u8 retries;	216	u8 retries;
		217	u8 rtscts_rate;
217	};	218	};
218		219
219	struct ath_buf_state {	220	struct ath_buf_state {

drivers/net/wireless/ath/ath9k/htc_drv_main.c+2−3

 			priv->num_sta_assoc_vif++ : priv->num_sta_assoc_vif--;
 		if (priv->ah->opmode == NL80211_IFTYPE_STATION) {
+			ath9k_htc_choose_set_bssid(priv);
 			if (bss_conf->assoc && (priv->num_sta_assoc_vif == 1))
 				ath9k_htc_start_ani(priv);
 			else if (priv->num_sta_assoc_vif == 0)
 		}
 	}
-	if (changed & BSS_CHANGED_BSSID) {
+	if (changed & BSS_CHANGED_IBSS) {
 		if (priv->ah->opmode == NL80211_IFTYPE_ADHOC) {
 			common->curaid = bss_conf->aid;
 			memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
 			ath9k_htc_set_bssid(priv);
-		} else if (priv->ah->opmode == NL80211_IFTYPE_STATION) {
-			ath9k_htc_choose_set_bssid(priv);
 		}
 	}

drivers/net/wireless/ath/ath9k/hw.c+13−1

 u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah)
 {
+	struct ath_common *common = ath9k_hw_common(ah);
+	int i = 0;
 	REG_CLR_BIT(ah, PLL3, PLL3_DO_MEAS_MASK);
 	udelay(100);
 	REG_SET_BIT(ah, PLL3, PLL3_DO_MEAS_MASK);
-	while ((REG_READ(ah, PLL4) & PLL4_MEAS_DONE) == 0)
+	while ((REG_READ(ah, PLL4) & PLL4_MEAS_DONE) == 0) {
 		udelay(100);
+		if (WARN_ON_ONCE(i >= 100)) {
+			ath_err(common, "PLL4 meaurement not done\n");
+			break;
+		}
+		i++;
+	}
 	return (REG_READ(ah, PLL3) & SQSUM_DVC_MASK) >> 3;
 }
 EXPORT_SYMBOL(ar9003_get_pll_sqsum_dvc);

drivers/net/wireless/ath/ath9k/main.c+9−18

 					    hw_pll_work.work);
 	u32 pll_sqsum;
+	/*
+	 * ensure that the PLL WAR is executed only
+	 * after the STA is associated (or) if the
+	 * beaconing had started in interfaces that
+	 * uses beacons.
+	 */
+	if (!(sc->sc_flags & SC_OP_BEACONS))
+		return;
 	if (AR_SREV_9485(sc->sc_ah)) {
 		ath9k_ps_wakeup(sc);
 		}
 	}
-	if ((ah->opmode == NL80211_IFTYPE_ADHOC) ||
-	    ((vif->type == NL80211_IFTYPE_ADHOC) &&
-	     sc->nvifs > 0)) {
-		ath_err(common, "Cannot create ADHOC interface when other"
-			" interfaces already exist.\n");
-		ret = -EINVAL;
-		goto out;
-	}
 	ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);
 	sc->nvifs++;
 	mutex_lock(&sc->mutex);
 	ath9k_ps_wakeup(sc);
-	/* See if new interface type is valid. */
-	if ((new_type == NL80211_IFTYPE_ADHOC) &&
-	    (sc->nvifs > 1)) {
-		ath_err(common, "When using ADHOC, it must be the only"
-			" interface.\n");
-		ret = -EINVAL;
-		goto out;
-	}
 	if (ath9k_uses_beacons(new_type) &&
 	    !ath9k_uses_beacons(vif->type)) {
 		if (sc->nbcnvifs >= ATH_BCBUF) {

drivers/net/wireless/ath/ath9k/xmit.c+18−13

@@ -938,6 +938,7 @@ static void ath_buf_set_rate(struct ath_softc sc, struct ath_buf bf, · 937 unmodified lines
938	struct ieee80211_tx_rate *rates;	938	struct ieee80211_tx_rate *rates;
939	const struct ieee80211_rate *rate;	939	const struct ieee80211_rate *rate;
940	struct ieee80211_hdr *hdr;	940	struct ieee80211_hdr *hdr;
		941	struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
941	int i;	942	int i;
942	u8 rix = 0;	943	u8 rix = 0;
943		944
@@ -948,18 +949,7 @@ static void ath_buf_set_rate(struct ath_softc sc, struct ath_buf bf, · 4 unmodified lines
948		949
949	/* set dur_update_en for l-sig computation except for PS-Poll frames */	950	/* set dur_update_en for l-sig computation except for PS-Poll frames */
950	info->dur_update = !ieee80211_is_pspoll(hdr->frame_control);	951	info->dur_update = !ieee80211_is_pspoll(hdr->frame_control);
951		952	info->rtscts_rate = fi->rtscts_rate;
952	/*
953	* We check if Short Preamble is needed for the CTS rate by
954	* checking the BSS's global flag.
955	* But for the rate series, IEEE80211_TX_RC_USE_SHORT_PREAMBLE is used.
956	*/
957	rate = ieee80211_get_rts_cts_rate(sc->hw, tx_info);
958	info->rtscts_rate = rate->hw_value;
959
960	if (tx_info->control.vif &&
961	tx_info->control.vif->bss_conf.use_short_preamble)
962	info->rtscts_rate \|= rate->hw_value_short;
963		953
964	for (i = 0; i < 4; i++) {	954	for (i = 0; i < 4; i++) {
965	bool is_40, is_sgi, is_sp;	955	bool is_40, is_sgi, is_sp;
@@ -1001,13 +991,13 @@ static void ath_buf_set_rate(struct ath_softc sc, struct ath_buf bf, · 35 unmodified lines
1001	}	991	}
1002		992
1003	/* legacy rates */	993	/* legacy rates */
		994	rate = &sc->sbands[tx_info->band].bitrates[rates[i].idx];
1004	if ((tx_info->band == IEEE80211_BAND_2GHZ) &&	995	if ((tx_info->band == IEEE80211_BAND_2GHZ) &&
1005	!(rate->flags & IEEE80211_RATE_ERP_G))	996	!(rate->flags & IEEE80211_RATE_ERP_G))
1006	phy = WLAN_RC_PHY_CCK;	997	phy = WLAN_RC_PHY_CCK;
1007	else	998	else
1008	phy = WLAN_RC_PHY_OFDM;	999	phy = WLAN_RC_PHY_OFDM;
1009		1000
1010	rate = &sc->sbands[tx_info->band].bitrates[rates[i].idx];
1011	info->rates[i].Rate = rate->hw_value;	1001	info->rates[i].Rate = rate->hw_value;
1012	if (rate->hw_value_short) {	1002	if (rate->hw_value_short) {
1013	if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)	1003	if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
@@ -1776,10 +1766,22 @@ static void setup_frame_info(struct ieee80211_hw hw, struct sk_buff skb, · 762 unmodified lines
1776	struct ieee80211_sta *sta = tx_info->control.sta;	1766	struct ieee80211_sta *sta = tx_info->control.sta;
1777	struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;	1767	struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
1778	struct ieee80211_hdr hdr = (struct ieee80211_hdr )skb->data;	1768	struct ieee80211_hdr hdr = (struct ieee80211_hdr )skb->data;
		1769	const struct ieee80211_rate *rate;
1779	struct ath_frame_info *fi = get_frame_info(skb);	1770	struct ath_frame_info *fi = get_frame_info(skb);
1780	struct ath_node *an = NULL;	1771	struct ath_node *an = NULL;
1781	enum ath9k_key_type keytype;	1772	enum ath9k_key_type keytype;
		1773	bool short_preamble = false;
		1774
		1775	/*
		1776	* We check if Short Preamble is needed for the CTS rate by
		1777	* checking the BSS's global flag.
		1778	* But for the rate series, IEEE80211_TX_RC_USE_SHORT_PREAMBLE is used.
		1779	*/
		1780	if (tx_info->control.vif &&
		1781	tx_info->control.vif->bss_conf.use_short_preamble)
		1782	short_preamble = true;
1782		1783
		1784	rate = ieee80211_get_rts_cts_rate(hw, tx_info);
1783	keytype = ath9k_cmn_get_hw_crypto_keytype(skb);	1785	keytype = ath9k_cmn_get_hw_crypto_keytype(skb);
1784		1786
1785	if (sta)	1787	if (sta)
@@ -1794,6 +1796,9 @@ static void setup_frame_info(struct ieee80211_hw hw, struct sk_buff skb, · 8 unmodified lines
1794	fi->keyix = ATH9K_TXKEYIX_INVALID;	1796	fi->keyix = ATH9K_TXKEYIX_INVALID;
1795	fi->keytype = keytype;	1797	fi->keytype = keytype;
1796	fi->framelen = framelen;	1798	fi->framelen = framelen;
		1799	fi->rtscts_rate = rate->hw_value;
		1800	if (short_preamble)
		1801	fi->rtscts_rate \|= rate->hw_value_short;
1797	}	1802	}
1798		1803
1799	u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate)	1804	u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate)

drivers/net/wireless/iwlwifi/iwl-debugfs.c+6−0

 	return count;
 }
+#ifdef CONFIG_IWLWIFI_DEBUG
 static ssize_t iwl_dbgfs_log_event_read(struct file *file,
 					 char __user *user_buf,
 					 size_t count, loff_t *ppos)
 	return count;
 }
+#endif
 static ssize_t iwl_dbgfs_calib_disabled_read(struct file *file,
 					 char __user *user_buf,
 DEBUGFS_READ_WRITE_FILE_OPS(protection_mode);
 DEBUGFS_READ_FILE_OPS(reply_tx_error);
 DEBUGFS_WRITE_FILE_OPS(echo_test);
+#ifdef CONFIG_IWLWIFI_DEBUG
 DEBUGFS_READ_WRITE_FILE_OPS(log_event);
+#endif
 DEBUGFS_READ_WRITE_FILE_OPS(calib_disabled);
 /*
 	DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);
 	DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);
 	DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR);
+#ifdef CONFIG_IWLWIFI_DEBUG
 	DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR);
+#endif
 	if (iwl_advanced_bt_coexist(priv))
 		DEBUGFS_ADD_FILE(bt_traffic, dir_debug, S_IRUSR);

drivers/net/wireless/mwifiex/cfg80211.c+11−14

 	struct wireless_dev *wdev;
 	if (!adapter)
-		return NULL;
+		return ERR_PTR(-EFAULT);
 	switch (type) {
 	case NL80211_IFTYPE_UNSPECIFIED:
 		if (priv->bss_mode) {
 			wiphy_err(wiphy,
 				  "cannot create multiple sta/adhoc ifaces\n");
-			return NULL;
+			return ERR_PTR(-EINVAL);
 		}
 		wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
 		if (!wdev)
-			return NULL;
+			return ERR_PTR(-ENOMEM);
 		wdev->wiphy = wiphy;
 		priv->wdev = wdev;
 		if (priv->bss_mode) {
 			wiphy_err(wiphy, "Can't create multiple AP interfaces");
-			return NULL;
+			return ERR_PTR(-EINVAL);
 		}
 		wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
 		if (!wdev)
-			return NULL;
+			return ERR_PTR(-ENOMEM);
 		priv->wdev = wdev;
 		wdev->wiphy = wiphy;
 		break;
 	default:
 		wiphy_err(wiphy, "type not supported\n");
-		return NULL;
+		return ERR_PTR(-EINVAL);
 	}
 	dev = alloc_netdev_mq(sizeof(struct mwifiex_private *), name,
 			      ether_setup, 1);
 	if (!dev) {
 		wiphy_err(wiphy, "no memory available for netdevice\n");
-		goto error;
+		priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
+		return ERR_PTR(-ENOMEM);
 	}
 	mwifiex_init_priv_params(priv, dev);
 	/* Register network device */
 	if (register_netdevice(dev)) {
 		wiphy_err(wiphy, "cannot register virtual network device\n");
-		goto error;
+		free_netdev(dev);
+		priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
+		return ERR_PTR(-EFAULT);
 	}
 	sema_init(&priv->async_sem, 1);
 	mwifiex_dev_debugfs_init(priv);
 #endif
 	return dev;
-error:
-	if (dev && (dev->reg_state == NETREG_UNREGISTERED))
-		free_netdev(dev);
-	priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
-	return NULL;
 }
 EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);

drivers/net/wireless/mwifiex/txrx.c+3−7

 		goto done;
 	for (i = 0; i < adapter->priv_num; i++) {
 		tpriv = adapter->priv[i];
-		if ((GET_BSS_ROLE(tpriv) == MWIFIEX_BSS_ROLE_STA) &&
+		if (tpriv->media_connected &&
-		    (tpriv->media_connected)) {
+		    netif_queue_stopped(tpriv->netdev))
-			if (netif_queue_stopped(tpriv->netdev))
+			mwifiex_wake_up_net_dev_queue(tpriv->netdev, adapter);
-				mwifiex_wake_up_net_dev_queue(tpriv->netdev,
-							      adapter);
-		}
 	}
 done:
 	dev_kfree_skb_any(skb);

drivers/net/wireless/mwifiex/uap_cmd.c+11−0

@@ -27,6 +27,17 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv, · 26 unmodified lines
27	struct cfg80211_ap_settings *params) {	27	struct cfg80211_ap_settings *params) {
28	int i;	28	int i;
29		29
		30	if (!params->privacy) {
		31	bss_config->protocol = PROTOCOL_NO_SECURITY;
		32	bss_config->key_mgmt = KEY_MGMT_NONE;
		33	bss_config->wpa_cfg.length = 0;
		34	priv->sec_info.wep_enabled = 0;
		35	priv->sec_info.wpa_enabled = 0;
		36	priv->sec_info.wpa2_enabled = 0;
		37
		38	return 0;
		39	}
		40
30	switch (params->auth_type) {	41	switch (params->auth_type) {
31	case NL80211_AUTHTYPE_OPEN_SYSTEM:	42	case NL80211_AUTHTYPE_OPEN_SYSTEM:
32	bss_config->auth_mode = WLAN_AUTH_OPEN;	43	bss_config->auth_mode = WLAN_AUTH_OPEN;

drivers/net/wireless/rndis_wlan.c+1−1

@@ -2110,7 +2110,7 @@ resize_buf: · 2109 unmodified lines
2110	while (check_bssid_list_item(bssid, bssid_len, buf, len)) {	2110	while (check_bssid_list_item(bssid, bssid_len, buf, len)) {
2111	if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&	2111	if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
2112	matched) {	2112	matched) {
2113	if (!ether_addr_equal(bssid->mac, match_bssid))	2113	if (ether_addr_equal(bssid->mac, match_bssid))
2114	*matched = true;	2114	*matched = true;
2115	}	2115	}
2116		2116

drivers/net/wireless/ti/wl1251/acx.c+1−1

@@ -869,7 +869,7 @@ int wl1251_acx_tsf_info(struct wl1251 wl, u64 mactime) · 868 unmodified lines
869	}	869	}
870		870
871	*mactime = tsf_info->current_tsf_lsb \|	871	*mactime = tsf_info->current_tsf_lsb \|
872	(tsf_info->current_tsf_msb << 31);	872	((u64)tsf_info->current_tsf_msb << 32);
873		873
874	out:	874	out:
875	kfree(tsf_info);	875	kfree(tsf_info);

drivers/net/wireless/ti/wl1251/event.c+1−2

@@ -76,8 +76,7 @@ static int wl1251_event_process(struct wl1251 wl, struct event_mailbox mbox) · 75 unmodified lines
76	}	76	}
77	}	77	}
78		78
79	if (vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID &&	79	if (vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID) {
80	wl->station_mode != STATION_ACTIVE_MODE) {
81	wl1251_debug(DEBUG_EVENT, "SYNCHRONIZATION_TIMEOUT_EVENT");	80	wl1251_debug(DEBUG_EVENT, "SYNCHRONIZATION_TIMEOUT_EVENT");
82		81
83	/* indicate to the stack, that beacons have been lost */	82	/* indicate to the stack, that beacons have been lost */

drivers/net/wireless/ti/wl1251/spi.c+4−0

 	spi_sync(wl_to_spi(wl), &m);
 	wl1251_dump(DEBUG_SPI, "spi reset -> ", cmd, WSPI_INIT_CMD_LEN);
+	kfree(cmd);
 }
 static void wl1251_spi_wake(struct wl1251 *wl)
 	spi_sync(wl_to_spi(wl), &m);
 	wl1251_dump(DEBUG_SPI, "spi init -> ", cmd, WSPI_INIT_CMD_LEN);
+	kfree(cmd);
 }
 static void wl1251_spi_reset_wake(struct wl1251 *wl)

drivers/net/xen-netfront.c+4−4

 	dev_dbg(&dev->dev, "%s\n", dev->nodename);
-	unregister_netdev(info->netdev);
 	xennet_disconnect_backend(info);
-	del_timer_sync(&info->rx_refill_timer);
 	xennet_sysfs_delif(info->netdev);
+	unregister_netdev(info->netdev);
+	del_timer_sync(&info->rx_refill_timer);
 	free_percpu(info->stats);
 	free_netdev(info->netdev);

drivers/oprofile/oprofile_perf.c+1−1

@@ -25,7 +25,7 @@ static int oprofile_perf_enabled; · 24 unmodified lines
25	static DEFINE_MUTEX(oprofile_perf_mutex);	25	static DEFINE_MUTEX(oprofile_perf_mutex);
26		26
27	static struct op_counter_config *counter_config;	27	static struct op_counter_config *counter_config;
28	static struct perf_event **perf_events[nr_cpumask_bits];	28	static struct perf_event **perf_events[NR_CPUS];
29	static int num_counters;	29	static int num_counters;
30		30
31	/*	31	/*

drivers/regulator/palmas-regulator.c+5−2

 			pmic->desc[id].ops = &palmas_ops_smps10;
 			pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;
 			pmic->desc[id].vsel_mask = SMPS10_VSEL;
-			pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;
+			pmic->desc[id].enable_reg =
+					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+							PALMAS_SMPS10_STATUS);
 			pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
 		}
 		pmic->desc[id].type = REGULATOR_VOLTAGE;
 		pmic->desc[id].owner = THIS_MODULE;
-		pmic->desc[id].enable_reg = palmas_regs_info[id].ctrl_addr;
+		pmic->desc[id].enable_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,
+						palmas_regs_info[id].ctrl_addr);
 		pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;
 		if (pdata && pdata->reg_data)

drivers/regulator/tps65023-regulator.c+1−1

@@ -71,7 +71,7 @@ · 70 unmodified lines
71		71
72	/* LDO_CTRL bitfields */	72	/* LDO_CTRL bitfields */
73	#define TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_id) ((ldo_id)*4)	73	#define TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_id) ((ldo_id)*4)
74	#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id) (0x0F << ((ldo_id)*4))	74	#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id) (0x07 << ((ldo_id)*4))
75		75
76	/* Number of step-down converters available */	76	/* Number of step-down converters available */
77	#define TPS65023_NUM_DCDC 3	77	#define TPS65023_NUM_DCDC 3

drivers/regulator/tps6524x-regulator.c+1−1

@@ -482,7 +482,7 @@ static int get_voltage_sel(struct regulator_dev *rdev) · 481 unmodified lines
482	info = &supply_info[rdev_get_id(rdev)];	482	info = &supply_info[rdev_get_id(rdev)];
483		483
484	if (info->flags & FIXED_VOLTAGE)	484	if (info->flags & FIXED_VOLTAGE)
485	return info->fixed_voltage;	485	return 0;
486		486
487	ret = read_field(hw, &info->voltage);	487	ret = read_field(hw, &info->voltage);
488	if (ret < 0)	488	if (ret < 0)

drivers/scsi/sd.c+2−0

 {
 	if (sdp->host->max_cmd_len < 16)
 		return 0;
+	if (sdp->try_rc_10_first)
+		return 0;
 	if (sdp->scsi_level > SCSI_SPC_2)
 		return 1;
 	if (scsi_device_protection(sdp))

drivers/staging/media/lirc/lirc_serial.c+6−0

 static struct lirc_serial hardware[] = {
 	[LIRC_HOMEBREW] = {
+		.lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_HOMEBREW].lock),
 		.signal_pin        = UART_MSR_DCD,
 		.signal_pin_change = UART_MSR_DDCD,
 		.on  = (UART_MCR_RTS | UART_MCR_OUT2 | UART_MCR_DTR),
 	},
 	[LIRC_IRDEO] = {
+		.lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_IRDEO].lock),
 		.signal_pin        = UART_MSR_DSR,
 		.signal_pin_change = UART_MSR_DDSR,
 		.on  = UART_MCR_OUT2,
 	},
 	[LIRC_IRDEO_REMOTE] = {
+		.lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_IRDEO_REMOTE].lock),
 		.signal_pin        = UART_MSR_DSR,
 		.signal_pin_change = UART_MSR_DDSR,
 		.on  = (UART_MCR_RTS | UART_MCR_DTR | UART_MCR_OUT2),
 	},
 	[LIRC_ANIMAX] = {
+		.lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_ANIMAX].lock),
 		.signal_pin        = UART_MSR_DCD,
 		.signal_pin_change = UART_MSR_DDCD,
 		.on  = 0,
 	},
 	[LIRC_IGOR] = {
+		.lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_IGOR].lock),
 		.signal_pin        = UART_MSR_DSR,
 		.signal_pin_change = UART_MSR_DDSR,
 		.on  = (UART_MCR_RTS | UART_MCR_OUT2 | UART_MCR_DTR),
 	 * See also http://www.nslu2-linux.org for this device
 	 */
 	[LIRC_NSLU2] = {
+		.lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_NSLU2].lock),
 		.signal_pin        = UART_MSR_CTS,
 		.signal_pin_change = UART_MSR_DCTS,
 		.on  = (UART_MCR_RTS | UART_MCR_OUT2 | UART_MCR_DTR),

drivers/usb/Makefile+1−1

@@ -46,7 +46,7 @@ obj-$(CONFIG_USB_MICROTEK) += image/ · 45 unmodified lines
46	obj-$(CONFIG_USB_SERIAL) += serial/	46	obj-$(CONFIG_USB_SERIAL) += serial/
47		47
48	obj-$(CONFIG_USB) += misc/	48	obj-$(CONFIG_USB) += misc/
49	obj-$(CONFIG_USB) += phy/	49	obj-$(CONFIG_USB_COMMON) += phy/
50	obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/	50	obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/
51		51
52	obj-$(CONFIG_USB_ATM) += atm/	52	obj-$(CONFIG_USB_ATM) += atm/

drivers/usb/dwc3/gadget.c+2−1

 		if (r == req) {
 			/* wait until it is processed */
 			dwc3_stop_active_transfer(dwc, dep->number);
-			goto out0;
+			goto out1;
 		}
 		dev_err(dwc->dev, "request %p was not queued to %s\n",
 				request, ep->name);
 		goto out0;
 	}
+out1:
 	/* giveback the request */
 	dwc3_gadget_giveback(dep, req, -ECONNRESET);

drivers/usb/gadget/fsl_qe_udc.h+2−2

@@ -153,10 +153,10 @@ struct usb_ep_para{ · 152 unmodified lines
153	#define USB_BUSMODE_DTB 0x02	153	#define USB_BUSMODE_DTB 0x02
154		154
155	/* Endpoint basic handle */	155	/* Endpoint basic handle */
156	#define ep_index(EP) ((EP)->desc->bEndpointAddress & 0xF)	156	#define ep_index(EP) ((EP)->ep.desc->bEndpointAddress & 0xF)
157	#define ep_maxpacket(EP) ((EP)->ep.maxpacket)	157	#define ep_maxpacket(EP) ((EP)->ep.maxpacket)
158	#define ep_is_in(EP) ((ep_index(EP) == 0) ? (EP->udc->ep0_dir == \	158	#define ep_is_in(EP) ((ep_index(EP) == 0) ? (EP->udc->ep0_dir == \
159	USB_DIR_IN) : ((EP)->desc->bEndpointAddress \	159	USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \
160	& USB_DIR_IN) == USB_DIR_IN)	160	& USB_DIR_IN) == USB_DIR_IN)
161		161
162	/* ep0 transfer state */	162	/* ep0 transfer state */

drivers/usb/gadget/lpc32xx_udc.c+1−0

@@ -61,6 +61,7 @@ · 60 unmodified lines
61	#include <mach/irqs.h>	61	#include <mach/irqs.h>
62	#include <mach/board.h>	62	#include <mach/board.h>
63	#ifdef CONFIG_USB_GADGET_DEBUG_FILES	63	#ifdef CONFIG_USB_GADGET_DEBUG_FILES
		64	#include <linux/debugfs.h>
64	#include <linux/seq_file.h>	65	#include <linux/seq_file.h>
65	#endif	66	#endif
66		67

drivers/usb/musb/musb_host.c+12−2

 	 */
 	if (list_empty(&qh->hep->urb_list)) {
 		struct list_head	*head;
+		struct dma_controller	*dma = musb->dma_controller;
-		if (is_in)
+		if (is_in) {
 			ep->rx_reinit = 1;
-		else
+			if (ep->rx_channel) {
+				dma->channel_release(ep->rx_channel);
+				ep->rx_channel = NULL;
+			}
+		} else {
 			ep->tx_reinit = 1;
+			if (ep->tx_channel) {
+				dma->channel_release(ep->tx_channel);
+				ep->tx_channel = NULL;
+			}
+		}
 		/* Clobber old pointers to this qh */
 		musb_ep_set_qh(ep, is_in, NULL);

drivers/usb/otg/twl6030-usb.c+6−9

 		regulator_enable(twl->usb3v3);
 		twl->asleep = 1;
-		twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_CLR, 0x1);
+		twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR);
-		twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_SET,
+		twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET);
-								0x10);
 		status = USB_EVENT_ID;
 		otg->default_a = true;
 		twl->phy.state = OTG_STATE_A_IDLE;
 		atomic_notifier_call_chain(&twl->phy.notifier, status,
 							otg->gadget);
 	} else  {
-		twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_CLR,
+		twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_CLR);
-								0x10);
+		twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
-		twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_SET,
-								0x1);
 	}
-	twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_LATCH_CLR, status);
+	twl6030_writeb(twl, TWL_MODULE_USB, status, USB_ID_INT_LATCH_CLR);
 	return IRQ_HANDLED;
 }
 {
 	struct twl6030_usb *twl = phy_to_twl(x);
-	twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_SET, 0x1);
+	twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
 	twl6030_interrupt_unmask(0x05, REG_INT_MSK_LINE_C);
 	twl6030_interrupt_unmask(0x05, REG_INT_MSK_STS_C);

drivers/usb/phy/Kconfig+2−2

@@ -2,11 +2,11 @@ · 1 unmodified line
2	# Physical Layer USB driver configuration	2	# Physical Layer USB driver configuration
3	#	3	#
4	comment "USB Physical Layer drivers"	4	comment "USB Physical Layer drivers"
5	depends on USB	5	depends on USB \|\| USB_GADGET
6		6
7	config USB_ISP1301	7	config USB_ISP1301
8	tristate "NXP ISP1301 USB transceiver support"	8	tristate "NXP ISP1301 USB transceiver support"
9	depends on USB	9	depends on USB \|\| USB_GADGET
10	depends on I2C	10	depends on I2C
11	help	11	help
12	Say Y here to add support for the NXP ISP1301 USB transceiver driver.	12	Say Y here to add support for the NXP ISP1301 USB transceiver driver.

drivers/usb/serial/cp210x.c+11−0

 	{ USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
 	{ USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */
 	{ USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
+	{ USB_DEVICE(0x10C4, 0x815F) }, /* Timewave HamLinkUSB */
 	{ USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */
 	{ USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
 	{ USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
 	{ USB_DEVICE(0x10CE, 0xEA6A) }, /* Silicon Labs MobiData GPRS USB Modem 100EU */
 	{ USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
 	{ USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */
+	{ USB_DEVICE(0x166A, 0x0201) }, /* Clipsal 5500PACA C-Bus Pascal Automation Controller */
+	{ USB_DEVICE(0x166A, 0x0301) }, /* Clipsal 5800PC C-Bus Wireless PC Interface */
 	{ USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */
+	{ USB_DEVICE(0x166A, 0x0304) }, /* Clipsal 5000CT2 C-Bus Black and White Touchscreen */
+	{ USB_DEVICE(0x166A, 0x0305) }, /* Clipsal C-5000CT2 C-Bus Spectrum Colour Touchscreen */
+	{ USB_DEVICE(0x166A, 0x0401) }, /* Clipsal L51xx C-Bus Architectural Dimmer */
+	{ USB_DEVICE(0x166A, 0x0101) }, /* Clipsal 5560884 C-Bus Multi-room Audio Matrix Switcher */
 	{ USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
 	{ USB_DEVICE(0x16DC, 0x0010) }, /* W-IE-NE-R Plein & Baus GmbH PL512 Power Supply */
 	{ USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */
 	{ USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
 	{ USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
 	{ USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */
+	{ USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */
+	{ USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */
 	{ USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
+	{ USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */
+	{ USB_DEVICE(0x3195, 0xF281) }, /* Link Instruments MSO-28 */
 	{ USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
 	{ } /* Terminating Entry */
 };

drivers/usb/serial/option.c+8−0

 #define NOVATELWIRELESS_PRODUCT_G1		0xA001
 #define NOVATELWIRELESS_PRODUCT_G1_M		0xA002
 #define NOVATELWIRELESS_PRODUCT_G2		0xA010
+#define NOVATELWIRELESS_PRODUCT_MC551		0xB001
 /* AMOI PRODUCTS */
 #define AMOI_VENDOR_ID				0x1614
 /* MediaTek products */
 #define MEDIATEK_VENDOR_ID			0x0e8d
+/* Cellient products */
+#define CELLIENT_VENDOR_ID			0x2692
+#define CELLIENT_PRODUCT_MEN200			0x9005
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
 		OPTION_BLACKLIST_NONE = 0,
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1_M) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) },
+	/* Novatel Ovation MC551 a.k.a. Verizon USB551L */
+	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC551, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
 	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff, 0x02, 0x01) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff, 0x00, 0x00) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff, 0x02, 0x01) },        /* MediaTek MT6276M modem & app port */
+	{ USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);

drivers/usb/storage/scsiglue.c+6−0

 		if (us->fflags & US_FL_NO_READ_CAPACITY_16)
 			sdev->no_read_capacity_16 = 1;
+		/*
+		 * Many devices do not respond properly to READ_CAPACITY_16.
+		 * Tell the SCSI layer to try READ_CAPACITY_10 first.
+		 */
+		sdev->try_rc_10_first = 1;
 		/* assume SPC3 or latter devices support sense size > 18 */
 		if (sdev->scsi_level > SCSI_SPC_2)
 			us->fflags |= US_FL_SANE_SENSE;

drivers/usb/storage/unusual_devs.h+0−7

@@ -1107,13 +1107,6 @@ UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999, · 1106 unmodified lines
1107	USB_SC_RBC, USB_PR_BULK, NULL,	1107	USB_SC_RBC, USB_PR_BULK, NULL,
1108	0 ),	1108	0 ),
1109		1109
1110	/* Feiya QDI U2 DISK, reported by Hans de Goede <hdegoede@redhat.com> */
1111	UNUSUAL_DEV( 0x090c, 0x1000, 0x0000, 0xffff,
1112	"Feiya",
1113	"QDI U2 DISK",
1114	USB_SC_DEVICE, USB_PR_DEVICE, NULL,
1115	US_FL_NO_READ_CAPACITY_16 ),
1116
1117	/* aeb */	1110	/* aeb */
1118	UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,	1111	UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
1119	"Feiya",	1112	"Feiya",

drivers/vhost/vhost.c+3−0

 	struct vhost_dev *dev = data;
 	struct vhost_work *work = NULL;
 	unsigned uninitialized_var(seq);
+	mm_segment_t oldfs = get_fs();
+	set_fs(USER_DS);
 	use_mm(dev->mm);
 	for (;;) {
 	}
 	unuse_mm(dev->mm);
+	set_fs(oldfs);
 	return 0;
 }

drivers/watchdog/hpwdt.c+3−1

 }  __attribute__((packed));
 static unsigned int hpwdt_nmi_decoding;
-static unsigned int allow_kdump;
+static unsigned int allow_kdump = 1;
 static unsigned int is_icru;
 static DEFINE_SPINLOCK(rom_lock);
 static void *cru_rom_addr;
 static void hpwdt_exit_nmi_decoding(void)
 {
 	unregister_nmi_handler(NMI_UNKNOWN, "hpwdt");
+	unregister_nmi_handler(NMI_SERR, "hpwdt");
+	unregister_nmi_handler(NMI_IO_CHECK, "hpwdt");
 	if (cru_rom_addr)
 		iounmap(cru_rom_addr);
 }

drivers/watchdog/iTCO_wdt.c+1−0

@@ -699,3 +699,4 @@ MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver"); · 698 unmodified lines
699	MODULE_VERSION(DRV_VERSION);	699	MODULE_VERSION(DRV_VERSION);
700	MODULE_LICENSE("GPL");	700	MODULE_LICENSE("GPL");
701	MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);	701	MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
		702	MODULE_ALIAS("platform:" DRV_NAME);

drivers/watchdog/watchdog_dev.c+1−1

@@ -349,7 +349,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd, · 348 unmodified lines
349	sizeof(struct watchdog_info)) ? -EFAULT : 0;	349	sizeof(struct watchdog_info)) ? -EFAULT : 0;
350	case WDIOC_GETSTATUS:	350	case WDIOC_GETSTATUS:
351	err = watchdog_get_status(wdd, &val);	351	err = watchdog_get_status(wdd, &val);
352	if (err)	352	if (err == -ENODEV)
353	return err;	353	return err;
354	return put_user(val, p);	354	return put_user(val, p);
355	case WDIOC_GETBOOTSTATUS:	355	case WDIOC_GETBOOTSTATUS:

fs/ubifs/debug.c+4−4

@@ -2918,7 +2918,7 @@ int dbg_debugfs_init_fs(struct ubifs_info *c) · 2917 unmodified lines
2918	struct dentry *dent;	2918	struct dentry *dent;
2919	struct ubifs_debug_info *d = c->dbg;	2919	struct ubifs_debug_info *d = c->dbg;
2920		2920
2921	if (!IS_ENABLED(DEBUG_FS))	2921	if (!IS_ENABLED(CONFIG_DEBUG_FS))
2922	return 0;	2922	return 0;
2923		2923
2924	n = snprintf(d->dfs_dir_name, UBIFS_DFS_DIR_LEN + 1, UBIFS_DFS_DIR_NAME,	2924	n = snprintf(d->dfs_dir_name, UBIFS_DFS_DIR_LEN + 1, UBIFS_DFS_DIR_NAME,
@@ -3013,7 +3013,7 @@ out: · 88 unmodified lines
3013	*/	3013	*/
3014	void dbg_debugfs_exit_fs(struct ubifs_info *c)	3014	void dbg_debugfs_exit_fs(struct ubifs_info *c)
3015	{	3015	{
3016	if (IS_ENABLED(DEBUG_FS))	3016	if (IS_ENABLED(CONFIG_DEBUG_FS))
3017	debugfs_remove_recursive(c->dbg->dfs_dir);	3017	debugfs_remove_recursive(c->dbg->dfs_dir);
3018	}	3018	}
3019		3019
@@ -3099,7 +3099,7 @@ int dbg_debugfs_init(void) · 79 unmodified lines
3099	const char *fname;	3099	const char *fname;
3100	struct dentry *dent;	3100	struct dentry *dent;
3101		3101
3102	if (!IS_ENABLED(DEBUG_FS))	3102	if (!IS_ENABLED(CONFIG_DEBUG_FS))
3103	return 0;	3103	return 0;
3104		3104
3105	fname = "ubifs";	3105	fname = "ubifs";
@@ -3166,7 +3166,7 @@ out: · 60 unmodified lines
3166	*/	3166	*/
3167	void dbg_debugfs_exit(void)	3167	void dbg_debugfs_exit(void)
3168	{	3168	{
3169	if (IS_ENABLED(DEBUG_FS))	3169	if (IS_ENABLED(CONFIG_DEBUG_FS))
3170	debugfs_remove_recursive(dfs_rootdir);	3170	debugfs_remove_recursive(dfs_rootdir);
3171	}	3171	}
3172		3172

fs/ubifs/find.c+2−2

@@ -939,8 +939,8 @@ static int find_dirtiest_idx_leb(struct ubifs_info *c) · 938 unmodified lines
939	}	939	}
940	dbg_find("LEB %d, dirty %d and free %d flags %#x", lp->lnum, lp->dirty,	940	dbg_find("LEB %d, dirty %d and free %d flags %#x", lp->lnum, lp->dirty,
941	lp->free, lp->flags);	941	lp->free, lp->flags);
942	ubifs_assert(lp->flags \| LPROPS_TAKEN);	942	ubifs_assert(lp->flags & LPROPS_TAKEN);
943	ubifs_assert(lp->flags \| LPROPS_INDEX);	943	ubifs_assert(lp->flags & LPROPS_INDEX);
944	return lnum;	944	return lnum;
945	}	945	}
946		946

fs/udf/super.c+64−38

@@ -56,6 +56,7 @@ · 55 unmodified lines
56	#include <linux/seq_file.h>	56	#include <linux/seq_file.h>
57	#include <linux/bitmap.h>	57	#include <linux/bitmap.h>
58	#include <linux/crc-itu-t.h>	58	#include <linux/crc-itu-t.h>
		59	#include <linux/log2.h>
59	#include <asm/byteorder.h>	60	#include <asm/byteorder.h>
60		61
61	#include "udf_sb.h"	62	#include "udf_sb.h"
@@ -1215,16 +1216,65 @@ out_bh: · 1153 unmodified lines
1215	return ret;	1216	return ret;
1216	}	1217	}
1217		1218
		1219	static int udf_load_sparable_map(struct super_block *sb,
		1220	struct udf_part_map *map,
		1221	struct sparablePartitionMap *spm)
		1222	{
		1223	uint32_t loc;
		1224	uint16_t ident;
		1225	struct sparingTable *st;
		1226	struct udf_sparing_data *sdata = &map->s_type_specific.s_sparing;
		1227	int i;
		1228	struct buffer_head *bh;
		1229
		1230	map->s_partition_type = UDF_SPARABLE_MAP15;
		1231	sdata->s_packet_len = le16_to_cpu(spm->packetLength);
		1232	if (!is_power_of_2(sdata->s_packet_len)) {
		1233	udf_err(sb, "error loading logical volume descriptor: "
		1234	"Invalid packet length %u\n",
		1235	(unsigned)sdata->s_packet_len);
		1236	return -EIO;
		1237	}
		1238	if (spm->numSparingTables > 4) {
		1239	udf_err(sb, "error loading logical volume descriptor: "
		1240	"Too many sparing tables (%d)\n",
		1241	(int)spm->numSparingTables);
		1242	return -EIO;
		1243	}
		1244
		1245	for (i = 0; i < spm->numSparingTables; i++) {
		1246	loc = le32_to_cpu(spm->locSparingTable[i]);
		1247	bh = udf_read_tagged(sb, loc, loc, &ident);
		1248	if (!bh)
		1249	continue;
		1250
		1251	st = (struct sparingTable *)bh->b_data;
		1252	if (ident != 0 \|\|
		1253	strncmp(st->sparingIdent.ident, UDF_ID_SPARING,
		1254	strlen(UDF_ID_SPARING)) \|\|
		1255	sizeof(*st) + le16_to_cpu(st->reallocationTableLen) >
		1256	sb->s_blocksize) {
		1257	brelse(bh);
		1258	continue;
		1259	}
		1260
		1261	sdata->s_spar_map[i] = bh;
		1262	}
		1263	map->s_partition_func = udf_get_pblock_spar15;
		1264	return 0;
		1265	}
		1266
1218	static int udf_load_logicalvol(struct super_block *sb, sector_t block,	1267	static int udf_load_logicalvol(struct super_block *sb, sector_t block,
1219	struct kernel_lb_addr *fileset)	1268	struct kernel_lb_addr *fileset)
1220	{	1269	{
1221	struct logicalVolDesc *lvd;	1270	struct logicalVolDesc *lvd;
1222	int i, j, offset;	1271	int i, offset;
1223	uint8_t type;	1272	uint8_t type;
1224	struct udf_sb_info *sbi = UDF_SB(sb);	1273	struct udf_sb_info *sbi = UDF_SB(sb);
1225	struct genericPartitionMap *gpm;	1274	struct genericPartitionMap *gpm;
1226	uint16_t ident;	1275	uint16_t ident;
1227	struct buffer_head *bh;	1276	struct buffer_head *bh;
		1277	unsigned int table_len;
1228	int ret = 0;	1278	int ret = 0;
1229		1279
1230	bh = udf_read_tagged(sb, block, block, &ident);	1280	bh = udf_read_tagged(sb, block, block, &ident);
@@ -1232,15 +1282,20 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block, · 1 unmodified line
1232	return 1;	1282	return 1;
1233	BUG_ON(ident != TAG_IDENT_LVD);	1283	BUG_ON(ident != TAG_IDENT_LVD);
1234	lvd = (struct logicalVolDesc *)bh->b_data;	1284	lvd = (struct logicalVolDesc *)bh->b_data;
1235		1285	table_len = le32_to_cpu(lvd->mapTableLength);
1236	i = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps));	1286	if (sizeof(*lvd) + table_len > sb->s_blocksize) {
1237	if (i != 0) {	1287	udf_err(sb, "error loading logical volume descriptor: "
1238	ret = i;	1288	"Partition table too long (%u > %lu)\n", table_len,
		1289	sb->s_blocksize - sizeof(*lvd));
1239	goto out_bh;	1290	goto out_bh;
1240	}	1291	}
1241		1292
		1293	ret = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps));
		1294	if (ret)
		1295	goto out_bh;
		1296
1242	for (i = 0, offset = 0;	1297	for (i = 0, offset = 0;
1243	i < sbi->s_partitions && offset < le32_to_cpu(lvd->mapTableLength);	1298	i < sbi->s_partitions && offset < table_len;
1244	i++, offset += gpm->partitionMapLength) {	1299	i++, offset += gpm->partitionMapLength) {
1245	struct udf_part_map *map = &sbi->s_partmaps[i];	1300	struct udf_part_map *map = &sbi->s_partmaps[i];
1246	gpm = (struct genericPartitionMap *)	1301	gpm = (struct genericPartitionMap *)
@@ -1275,38 +1330,9 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block, · 28 unmodified lines
1275	} else if (!strncmp(upm2->partIdent.ident,	1330	} else if (!strncmp(upm2->partIdent.ident,
1276	UDF_ID_SPARABLE,	1331	UDF_ID_SPARABLE,
1277	strlen(UDF_ID_SPARABLE))) {	1332	strlen(UDF_ID_SPARABLE))) {
1278	uint32_t loc;	1333	if (udf_load_sparable_map(sb, map,
1279	struct sparingTable *st;	1334	(struct sparablePartitionMap *)gpm) < 0)
1280	struct sparablePartitionMap *spm =	1335	goto out_bh;
1281	(struct sparablePartitionMap *)gpm;
1282
1283	map->s_partition_type = UDF_SPARABLE_MAP15;
1284	map->s_type_specific.s_sparing.s_packet_len =
1285	le16_to_cpu(spm->packetLength);
1286	for (j = 0; j < spm->numSparingTables; j++) {
1287	struct buffer_head *bh2;
1288
1289	loc = le32_to_cpu(
1290	spm->locSparingTable[j]);
1291	bh2 = udf_read_tagged(sb, loc, loc,
1292	&ident);
1293	map->s_type_specific.s_sparing.
1294	s_spar_map[j] = bh2;
1295
1296	if (bh2 == NULL)
1297	continue;
1298
1299	st = (struct sparingTable *)bh2->b_data;
1300	if (ident != 0 \|\| strncmp(
1301	st->sparingIdent.ident,
1302	UDF_ID_SPARING,
1303	strlen(UDF_ID_SPARING))) {
1304	brelse(bh2);
1305	map->s_type_specific.s_sparing.
1306	s_spar_map[j] = NULL;
1307	}
1308	}
1309	map->s_partition_func = udf_get_pblock_spar15;
1310	} else if (!strncmp(upm2->partIdent.ident,	1336	} else if (!strncmp(upm2->partIdent.ident,
1311	UDF_ID_METADATA,	1337	UDF_ID_METADATA,
1312	strlen(UDF_ID_METADATA))) {	1338	strlen(UDF_ID_METADATA))) {

include/asm-generic/bug.h+9−10

 #include <linux/compiler.h>
+#ifdef CONFIG_GENERIC_BUG
+#define BUGFLAG_WARNING		(1 << 0)
+#define BUGFLAG_TAINT(taint)	(BUGFLAG_WARNING | ((taint) << 8))
+#define BUG_GET_TAINT(bug)	((bug)->flags >> 8)
+#endif
+#ifndef __ASSEMBLY__
+#include <linux/kernel.h>
 #ifdef CONFIG_BUG
 #ifdef CONFIG_GENERIC_BUG
-#ifndef __ASSEMBLY__
 struct bug_entry {
 #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
 	unsigned long	bug_addr;
 #endif
 	unsigned short	flags;
 };
-#endif		/* __ASSEMBLY__ */
-#define BUGFLAG_WARNING		(1 << 0)
-#define BUGFLAG_TAINT(taint)	(BUGFLAG_WARNING | ((taint) << 8))
-#define BUG_GET_TAINT(bug)	((bug)->flags >> 8)
 #endif	/* CONFIG_GENERIC_BUG */
-#ifndef __ASSEMBLY__
-#include <linux/kernel.h>
 /*
  * Don't use BUG() or BUG_ON() unless there's really no way out; one
  * example might be detecting data structure corruption in the middle

include/linux/irq.h+0−2

  * @irq_pm_shutdown:	function called from core code on shutdown once per chip
  * @irq_print_chip:	optional to print special chip info in show_interrupts
  * @flags:		chip specific flags
- *
- * @release:		release function solely used by UML
  */
 struct irq_chip {
 	const char	*name;

include/linux/skbuff.h+2−5

 	/* device driver is going to provide hardware time stamp */
 	SKBTX_IN_PROGRESS = 1 << 2,
-	/* ensure the originating sk reference is available on driver level */
-	SKBTX_DRV_NEEDS_SK_REF = 1 << 3,
 	/* device driver supports TX zero-copy buffers */
-	SKBTX_DEV_ZEROCOPY = 1 << 4,
+	SKBTX_DEV_ZEROCOPY = 1 << 3,
 	/* generate wifi status information (where possible) */
-	SKBTX_WIFI_STATUS = 1 << 5,
+	SKBTX_WIFI_STATUS = 1 << 4,
 };
 /*

include/linux/videodev2.h+3−3

@@ -2640,9 +2640,9 @@ struct v4l2_create_buffers { · 2639 unmodified lines
2640		2640
2641	/* Experimental, these three ioctls may change over the next couple of kernel	2641	/* Experimental, these three ioctls may change over the next couple of kernel
2642	versions. */	2642	versions. */
2643	#define VIDIOC_ENUM_DV_TIMINGS _IOWR('V', 96, struct v4l2_enum_dv_timings)	2643	#define VIDIOC_ENUM_DV_TIMINGS _IOWR('V', 98, struct v4l2_enum_dv_timings)
2644	#define VIDIOC_QUERY_DV_TIMINGS _IOR('V', 97, struct v4l2_dv_timings)	2644	#define VIDIOC_QUERY_DV_TIMINGS _IOR('V', 99, struct v4l2_dv_timings)
2645	#define VIDIOC_DV_TIMINGS_CAP _IOWR('V', 98, struct v4l2_dv_timings_cap)	2645	#define VIDIOC_DV_TIMINGS_CAP _IOWR('V', 100, struct v4l2_dv_timings_cap)
2646		2646
2647	/* Reminder: when adding new ioctls please add support for them to	2647	/* Reminder: when adding new ioctls please add support for them to
2648	drivers/media/video/v4l2-compat-ioctl32.c as well! */	2648	drivers/media/video/v4l2-compat-ioctl32.c as well! */

include/net/bluetooth/hci.h+6−0

 	__u8     data[240];
 } __packed;
+#define HCI_EV_KEY_REFRESH_COMPLETE	0x30
+struct hci_ev_key_refresh_complete {
+	__u8	status;
+	__le16	handle;
+} __packed;
 #define HCI_EV_IO_CAPA_REQUEST		0x31
 struct hci_ev_io_capa_request {
 	bdaddr_t bdaddr;

include/net/mac80211.h+6−0

  *	to also unregister the device. If it returns 1, then mac80211
  *	will also go through the regular complete restart on resume.
  *
+ * @set_wakeup: Enable or disable wakeup when WoWLAN configuration is
+ *	modified. The reason is that device_set_wakeup_enable() is
+ *	supposed to be called when the configuration changes, not only
+ *	in suspend().
+ *
  * @add_interface: Called when a netdevice attached to the hardware is
  *	enabled. Because it is not called for monitor mode devices, @start
  *	and @stop must be implemented.
  * ieee80211_generic_frame_duration - Calculate the duration field for a frame
  * @hw: pointer obtained from ieee80211_alloc_hw().
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ * @band: the band to calculate the frame duration on
  * @frame_len: the length of the frame.
  * @rate: the rate at which the frame is going to be transmitted.
  *

include/net/phonet/gprs.h+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Author: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Author: Rémi Denis-Courmont
9	*	9	*
10	* This program is free software; you can redistribute it and/or	10	* This program is free software; you can redistribute it and/or
11	* modify it under the terms of the GNU General Public License	11	* modify it under the terms of the GNU General Public License

include/scsi/scsi_device.h+1−0

@@ -151,6 +151,7 @@ struct scsi_device { · 150 unmodified lines
151	SD_LAST_BUGGY_SECTORS */	151	SD_LAST_BUGGY_SECTORS */
152	unsigned no_read_disc_info:1; /* Avoid READ_DISC_INFO cmds */	152	unsigned no_read_disc_info:1; /* Avoid READ_DISC_INFO cmds */
153	unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */	153	unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */
		154	unsigned try_rc_10_first:1; /* Try READ_CAPACACITY_10 first */
154	unsigned is_visible:1; /* is the device visible in sysfs */	155	unsigned is_visible:1; /* is the device visible in sysfs */
155		156
156	DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */	157	DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */

include/sound/tea575x-tuner.h+2−1

 struct snd_tea575x {
 	struct v4l2_device *v4l2_dev;
+	struct v4l2_file_operations fops;
 	struct video_device vd;		/* video device */
 	int radio_nr;			/* radio_nr */
 	bool tea5759;			/* 5759 chip is present */
 	int (*ext_init)(struct snd_tea575x *tea);
 };
-int snd_tea575x_init(struct snd_tea575x *tea);
+int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner);
 void snd_tea575x_exit(struct snd_tea575x *tea);
 #endif /* __SOUND_TEA575X_TUNER_H */

kernel/printk.c+214−85

@@ -193,12 +193,19 @@ static int console_may_schedule; · 192 unmodified lines
193	* separated by ',', and find the message after the ';' character.	193	* separated by ',', and find the message after the ';' character.
194	*/	194	*/
195		195
		196	enum log_flags {
		197	LOG_DEFAULT = 0,
		198	LOG_NOCONS = 1, /* already flushed, do not print to console */
		199	};
		200
196	struct log {	201	struct log {
197	u64 ts_nsec; /* timestamp in nanoseconds */	202	u64 ts_nsec; /* timestamp in nanoseconds */
198	u16 len; /* length of entire record */	203	u16 len; /* length of entire record */
199	u16 text_len; /* length of text buffer */	204	u16 text_len; /* length of text buffer */
200	u16 dict_len; /* length of dictionary buffer */	205	u16 dict_len; /* length of dictionary buffer */
201	u16 level; /* syslog level + facility */	206	u8 facility; /* syslog facility */
		207	u8 flags:5; /* internal record flags */
		208	u8 level:3; /* syslog level */
202	};	209	};
203		210
204	/*	211	/*
@@ -286,6 +293,7 @@ static u32 log_next(u32 idx) · 81 unmodified lines
286		293
287	/* insert record into the buffer, discard old ones, update heads */	294	/* insert record into the buffer, discard old ones, update heads */
288	static void log_store(int facility, int level,	295	static void log_store(int facility, int level,
		296	enum log_flags flags, u64 ts_nsec,
289	const char *dict, u16 dict_len,	297	const char *dict, u16 dict_len,
290	const char *text, u16 text_len)	298	const char *text, u16 text_len)
291	{	299	{
@@ -329,8 +337,13 @@ static void log_store(int facility, int level, · 37 unmodified lines
329	msg->text_len = text_len;	337	msg->text_len = text_len;
330	memcpy(log_dict(msg), dict, dict_len);	338	memcpy(log_dict(msg), dict, dict_len);
331	msg->dict_len = dict_len;	339	msg->dict_len = dict_len;
332	msg->level = (facility << 3) \| (level & 7);	340	msg->facility = facility;
333	msg->ts_nsec = local_clock();	341	msg->level = level & 7;
		342	msg->flags = flags & 0x1f;
		343	if (ts_nsec > 0)
		344	msg->ts_nsec = ts_nsec;
		345	else
		346	msg->ts_nsec = local_clock();
334	memset(log_dict(msg) + dict_len, 0, pad_len);	347	memset(log_dict(msg) + dict_len, 0, pad_len);
335	msg->len = sizeof(struct log) + text_len + dict_len + pad_len;	348	msg->len = sizeof(struct log) + text_len + dict_len + pad_len;
336		349
@@ -446,7 +459,7 @@ static ssize_t devkmsg_read(struct file file, char __user buf, · 109 unmodified lines
446	ts_usec = msg->ts_nsec;	459	ts_usec = msg->ts_nsec;
447	do_div(ts_usec, 1000);	460	do_div(ts_usec, 1000);
448	len = sprintf(user->buf, "%u,%llu,%llu;",	461	len = sprintf(user->buf, "%u,%llu,%llu;",
449	msg->level, user->seq, ts_usec);	462	(msg->facility << 3) \| msg->level, user->seq, ts_usec);
450		463
451	/* escape non-printable characters */	464	/* escape non-printable characters */
452	for (i = 0; i < msg->text_len; i++) {	465	for (i = 0; i < msg->text_len; i++) {
@@ -787,6 +800,21 @@ static bool printk_time; · 334 unmodified lines
787	#endif	800	#endif
788	module_param_named(time, printk_time, bool, S_IRUGO \| S_IWUSR);	801	module_param_named(time, printk_time, bool, S_IRUGO \| S_IWUSR);
789		802
		803	static size_t print_time(u64 ts, char *buf)
		804	{
		805	unsigned long rem_nsec;
		806
		807	if (!printk_time)
		808	return 0;
		809
		810	if (!buf)
		811	return 15;
		812
		813	rem_nsec = do_div(ts, 1000000000);
		814	return sprintf(buf, "[%5lu.%06lu] ",
		815	(unsigned long)ts, rem_nsec / 1000);
		816	}
		817
790	static size_t print_prefix(const struct log msg, bool syslog, char buf)	818	static size_t print_prefix(const struct log msg, bool syslog, char buf)
791	{	819	{
792	size_t len = 0;	820	size_t len = 0;
@@ -803,18 +831,7 @@ static size_t print_prefix(const struct log msg, bool syslog, char buf) · 10 unmodified lines
803	}	831	}
804	}	832	}
805		833
806	if (printk_time) {	834	len += print_time(msg->ts_nsec, buf ? buf + len : NULL);
807	if (buf) {
808	unsigned long long ts = msg->ts_nsec;
809	unsigned long rem_nsec = do_div(ts, 1000000000);
810
811	len += sprintf(buf + len, "[%5lu.%06lu] ",
812	(unsigned long) ts, rem_nsec / 1000);
813	} else {
814	len += 15;
815	}
816	}
817
818	return len;	835	return len;
819	}	836	}
820		837
@@ -862,28 +879,49 @@ static int syslog_print(char __user *buf, int size) · 41 unmodified lines
862	{	879	{
863	char *text;	880	char *text;
864	struct log *msg;	881	struct log *msg;
865	int len;	882	int len = 0;
866		883
867	text = kmalloc(LOG_LINE_MAX, GFP_KERNEL);	884	text = kmalloc(LOG_LINE_MAX, GFP_KERNEL);
868	if (!text)	885	if (!text)
869	return -ENOMEM;	886	return -ENOMEM;
870		887
871	raw_spin_lock_irq(&logbuf_lock);	888	while (size > 0) {
872	if (syslog_seq < log_first_seq) {	889	size_t n;
873	/* messages are gone, move to first one */
874	syslog_seq = log_first_seq;
875	syslog_idx = log_first_idx;
876	}
877	msg = log_from_idx(syslog_idx);
878	len = msg_print_text(msg, true, text, LOG_LINE_MAX);
879	syslog_idx = log_next(syslog_idx);
880	syslog_seq++;
881	raw_spin_unlock_irq(&logbuf_lock);
882		890
883	if (len > size)	891	raw_spin_lock_irq(&logbuf_lock);
884	len = -EINVAL;	892	if (syslog_seq < log_first_seq) {
885	else if (len > 0 && copy_to_user(buf, text, len))	893	/* messages are gone, move to first one */
886	len = -EFAULT;	894	syslog_seq = log_first_seq;
		895	syslog_idx = log_first_idx;
		896	}
		897	if (syslog_seq == log_next_seq) {
		898	raw_spin_unlock_irq(&logbuf_lock);
		899	break;
		900	}
		901	msg = log_from_idx(syslog_idx);
		902	n = msg_print_text(msg, true, text, LOG_LINE_MAX);
		903	if (n <= size) {
		904	syslog_idx = log_next(syslog_idx);
		905	syslog_seq++;
		906	} else
		907	n = 0;
		908	raw_spin_unlock_irq(&logbuf_lock);
		909
		910	if (!n)
		911	break;
		912
		913	len += n;
		914	size -= n;
		915	buf += n;
		916	n = copy_to_user(buf - n, text, n);
		917
		918	if (n) {
		919	len -= n;
		920	if (!len)
		921	len = -EFAULT;
		922	break;
		923	}
		924	}
887		925
888	kfree(text);	926	kfree(text);
889	return len;	927	return len;
@@ -1040,6 +1078,7 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) · 150 unmodified lines
1040	/* Clear ring buffer */	1078	/* Clear ring buffer */
1041	case SYSLOG_ACTION_CLEAR:	1079	case SYSLOG_ACTION_CLEAR:
1042	syslog_print_all(NULL, 0, true);	1080	syslog_print_all(NULL, 0, true);
		1081	break;
1043	/* Disable logging to console */	1082	/* Disable logging to console */
1044	case SYSLOG_ACTION_CONSOLE_OFF:	1083	case SYSLOG_ACTION_CONSOLE_OFF:
1045	if (saved_console_loglevel == -1)	1084	if (saved_console_loglevel == -1)
@@ -1272,15 +1311,92 @@ static inline void printk_delay(void) · 226 unmodified lines
1272	}	1311	}
1273	}	1312	}
1274		1313
		1314	/*
		1315	* Continuation lines are buffered, and not committed to the record buffer
		1316	* until the line is complete, or a race forces it. The line fragments
		1317	* though, are printed immediately to the consoles to ensure everything has
		1318	* reached the console in case of a kernel crash.
		1319	*/
		1320	static struct cont {
		1321	char buf[LOG_LINE_MAX];
		1322	size_t len; /* length == 0 means unused buffer */
		1323	size_t cons; /* bytes written to console */
		1324	struct task_struct owner; / task of first print*/
		1325	u64 ts_nsec; /* time of first print */
		1326	u8 level; /* log level of first message */
		1327	u8 facility; /* log level of first message */
		1328	bool flushed:1; /* buffer sealed and committed */
		1329	} cont;
		1330
		1331	static void cont_flush(void)
		1332	{
		1333	if (cont.flushed)
		1334	return;
		1335	if (cont.len == 0)
		1336	return;
		1337
		1338	log_store(cont.facility, cont.level, LOG_NOCONS, cont.ts_nsec,
		1339	NULL, 0, cont.buf, cont.len);
		1340
		1341	cont.flushed = true;
		1342	}
		1343
		1344	static bool cont_add(int facility, int level, const char *text, size_t len)
		1345	{
		1346	if (cont.len && cont.flushed)
		1347	return false;
		1348
		1349	if (cont.len + len > sizeof(cont.buf)) {
		1350	cont_flush();
		1351	return false;
		1352	}
		1353
		1354	if (!cont.len) {
		1355	cont.facility = facility;
		1356	cont.level = level;
		1357	cont.owner = current;
		1358	cont.ts_nsec = local_clock();
		1359	cont.cons = 0;
		1360	cont.flushed = false;
		1361	}
		1362
		1363	memcpy(cont.buf + cont.len, text, len);
		1364	cont.len += len;
		1365	return true;
		1366	}
		1367
		1368	static size_t cont_print_text(char *text, size_t size)
		1369	{
		1370	size_t textlen = 0;
		1371	size_t len;
		1372
		1373	if (cont.cons == 0) {
		1374	textlen += print_time(cont.ts_nsec, text);
		1375	size -= textlen;
		1376	}
		1377
		1378	len = cont.len - cont.cons;
		1379	if (len > 0) {
		1380	if (len+1 > size)
		1381	len = size-1;
		1382	memcpy(text + textlen, cont.buf + cont.cons, len);
		1383	textlen += len;
		1384	cont.cons = cont.len;
		1385	}
		1386
		1387	if (cont.flushed) {
		1388	text[textlen++] = '\n';
		1389	/* got everything, release buffer */
		1390	cont.len = 0;
		1391	}
		1392	return textlen;
		1393	}
		1394
1275	asmlinkage int vprintk_emit(int facility, int level,	1395	asmlinkage int vprintk_emit(int facility, int level,
1276	const char *dict, size_t dictlen,	1396	const char *dict, size_t dictlen,
1277	const char *fmt, va_list args)	1397	const char *fmt, va_list args)
1278	{	1398	{
1279	static int recursion_bug;	1399	static int recursion_bug;
1280	static char cont_buf[LOG_LINE_MAX];
1281	static size_t cont_len;
1282	static int cont_level;
1283	static struct task_struct *cont_task;
1284	static char textbuf[LOG_LINE_MAX];	1400	static char textbuf[LOG_LINE_MAX];
1285	char *text = textbuf;	1401	char *text = textbuf;
1286	size_t text_len;	1402	size_t text_len;
@@ -1326,7 +1442,8 @@ asmlinkage int vprintk_emit(int facility, int level, · 39 unmodified lines
1326	recursion_bug = 0;	1442	recursion_bug = 0;
1327	printed_len += strlen(recursion_msg);	1443	printed_len += strlen(recursion_msg);
1328	/* emit KERN_CRIT message */	1444	/* emit KERN_CRIT message */
1329	log_store(0, 2, NULL, 0, recursion_msg, printed_len);	1445	log_store(0, 2, LOG_DEFAULT, 0,
		1446	NULL, 0, recursion_msg, printed_len);
1330	}	1447	}
1331		1448
1332	/*	1449	/*
@@ -1364,55 +1481,37 @@ asmlinkage int vprintk_emit(int facility, int level, · 31 unmodified lines
1364	}	1481	}
1365		1482
1366	if (!newline) {	1483	if (!newline) {
1367	if (cont_len && (prefix \|\| cont_task != current)) {	1484	/*
1368	/*	1485	* Flush the conflicting buffer. An earlier newline was missing,
1369	* Flush earlier buffer, which is either from a	1486	* or another task also prints continuation lines.
1370	* different thread, or when we got a new prefix.	1487	*/
1371	*/	1488	if (cont.len && (prefix \|\| cont.owner != current))
1372	log_store(facility, cont_level, NULL, 0, cont_buf, cont_len);	1489	cont_flush();
1373	cont_len = 0;
1374	}
1375
1376	if (!cont_len) {
1377	cont_level = level;
1378	cont_task = current;
1379	}
1380		1490
1381	/* buffer or append to earlier buffer from the same thread */	1491	/* buffer line if possible, otherwise store it right away */
1382	if (cont_len + text_len > sizeof(cont_buf))	1492	if (!cont_add(facility, level, text, text_len))
1383	text_len = sizeof(cont_buf) - cont_len;	1493	log_store(facility, level, LOG_DEFAULT, 0,
1384	memcpy(cont_buf + cont_len, text, text_len);	1494	dict, dictlen, text, text_len);
1385	cont_len += text_len;
1386	} else {	1495	} else {
1387	if (cont_len && cont_task == current) {	1496	bool stored = false;
1388	if (prefix) {
1389	/*
1390	* New prefix from the same thread; flush. We
1391	* either got no earlier newline, or we race
1392	* with an interrupt.
1393	*/
1394	log_store(facility, cont_level,
1395	NULL, 0, cont_buf, cont_len);
1396	cont_len = 0;
1397	}
1398		1497
1399	/* append to the earlier buffer and flush */	1498	/*
1400	if (cont_len + text_len > sizeof(cont_buf))	1499	* If an earlier newline was missing and it was the same task,
1401	text_len = sizeof(cont_buf) - cont_len;	1500	* either merge it with the current buffer and flush, or if
1402	memcpy(cont_buf + cont_len, text, text_len);	1501	* there was a race with interrupts (prefix == true) then just
1403	cont_len += text_len;	1502	* flush it out and store this line separately.
1404	log_store(facility, cont_level,	1503	*/
1405	NULL, 0, cont_buf, cont_len);	1504	if (cont.len && cont.owner == current) {
1406	cont_len = 0;	1505	if (!prefix)
1407	cont_task = NULL;	1506	stored = cont_add(facility, level, text, text_len);
1408	printed_len = cont_len;	1507	cont_flush();
1409	} else {
1410	/* ordinary single and terminated line */
1411	log_store(facility, level,
1412	dict, dictlen, text, text_len);
1413	printed_len = text_len;
1414	}	1508	}
		1509
		1510	if (!stored)
		1511	log_store(facility, level, LOG_DEFAULT, 0,
		1512	dict, dictlen, text, text_len);
1415	}	1513	}
		1514	printed_len += text_len;
1416		1515
1417	/*	1516	/*
1418	* Try to acquire and then immediately release the console semaphore.	1517	* Try to acquire and then immediately release the console semaphore.
@@ -1499,11 +1598,18 @@ EXPORT_SYMBOL(printk); · 80 unmodified lines
1499	#else	1598	#else
1500		1599
1501	#define LOG_LINE_MAX 0	1600	#define LOG_LINE_MAX 0
		1601	static struct cont {
		1602	size_t len;
		1603	size_t cons;
		1604	u8 level;
		1605	bool flushed:1;
		1606	} cont;
1502	static struct log *log_from_idx(u32 idx) { return NULL; }	1607	static struct log *log_from_idx(u32 idx) { return NULL; }
1503	static u32 log_next(u32 idx) { return 0; }	1608	static u32 log_next(u32 idx) { return 0; }
1504	static void call_console_drivers(int level, const char *text, size_t len) {}	1609	static void call_console_drivers(int level, const char *text, size_t len) {}
1505	static size_t msg_print_text(const struct log *msg, bool syslog,	1610	static size_t msg_print_text(const struct log *msg, bool syslog,
1506	char *buf, size_t size) { return 0; }	1611	char *buf, size_t size) { return 0; }
		1612	static size_t cont_print_text(char *text, size_t size) { return 0; }
1507		1613
1508	#endif /* CONFIG_PRINTK */	1614	#endif /* CONFIG_PRINTK */
1509		1615
@@ -1795,6 +1901,7 @@ static u32 console_idx; · 285 unmodified lines
1795	*/	1901	*/
1796	void console_unlock(void)	1902	void console_unlock(void)
1797	{	1903	{
		1904	static char text[LOG_LINE_MAX];
1798	static u64 seen_seq;	1905	static u64 seen_seq;
1799	unsigned long flags;	1906	unsigned long flags;
1800	bool wake_klogd = false;	1907	bool wake_klogd = false;
@@ -1807,10 +1914,23 @@ void console_unlock(void) · 6 unmodified lines
1807		1914
1808	console_may_schedule = 0;	1915	console_may_schedule = 0;
1809		1916
		1917	/* flush buffered message fragment immediately to console */
		1918	raw_spin_lock_irqsave(&logbuf_lock, flags);
		1919	if (cont.len && (cont.cons < cont.len \|\| cont.flushed)) {
		1920	size_t len;
		1921
		1922	len = cont_print_text(text, sizeof(text));
		1923	raw_spin_unlock(&logbuf_lock);
		1924	stop_critical_timings();
		1925	call_console_drivers(cont.level, text, len);
		1926	start_critical_timings();
		1927	local_irq_restore(flags);
		1928	} else
		1929	raw_spin_unlock_irqrestore(&logbuf_lock, flags);
		1930
1810	again:	1931	again:
1811	for (;;) {	1932	for (;;) {
1812	struct log *msg;	1933	struct log *msg;
1813	static char text[LOG_LINE_MAX];
1814	size_t len;	1934	size_t len;
1815	int level;	1935	int level;
1816		1936
@@ -1825,13 +1945,22 @@ again: · 8 unmodified lines
1825	console_seq = log_first_seq;	1945	console_seq = log_first_seq;
1826	console_idx = log_first_idx;	1946	console_idx = log_first_idx;
1827	}	1947	}
1828		1948	skip:
1829	if (console_seq == log_next_seq)	1949	if (console_seq == log_next_seq)
1830	break;	1950	break;
1831		1951
1832	msg = log_from_idx(console_idx);	1952	msg = log_from_idx(console_idx);
1833	level = msg->level & 7;	1953	if (msg->flags & LOG_NOCONS) {
		1954	/*
		1955	* Skip record we have buffered and already printed
		1956	* directly to the console when we received it.
		1957	*/
		1958	console_idx = log_next(console_idx);
		1959	console_seq++;
		1960	goto skip;
		1961	}
1834		1962
		1963	level = msg->level;
1835	len = msg_print_text(msg, false, text, sizeof(text));	1964	len = msg_print_text(msg, false, text, sizeof(text));
1836		1965
1837	console_idx = log_next(console_idx);	1966	console_idx = log_next(console_idx);
@@ -2409,7 +2538,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_line); · 571 unmodified lines
2409	* kmsg_dump_get_buffer - copy kmsg log lines	2538	* kmsg_dump_get_buffer - copy kmsg log lines
2410	* @dumper: registered kmsg dumper	2539	* @dumper: registered kmsg dumper
2411	* @syslog: include the "<4>" prefixes	2540	* @syslog: include the "<4>" prefixes
2412	* @line: buffer to copy the line to	2541	* @buf: buffer to copy the line to
2413	* @size: maximum size of the buffer	2542	* @size: maximum size of the buffer
2414	* @len: length of line placed into buffer	2543	* @len: length of line placed into buffer
2415	*	2544	*

kernel/rcutree.c+7−7

@@ -1530,7 +1530,7 @@ static void rcu_do_batch(struct rcu_state rsp, struct rcu_data rdp) · 1529 unmodified lines
1530	{	1530	{
1531	unsigned long flags;	1531	unsigned long flags;
1532	struct rcu_head next, list, **tail;	1532	struct rcu_head next, list, **tail;
1533	int bl, count, count_lazy;	1533	int bl, count, count_lazy, i;
1534		1534
1535	/* If no callbacks are ready, just return.*/	1535	/* If no callbacks are ready, just return.*/
1536	if (!cpu_has_callbacks_ready_to_invoke(rdp)) {	1536	if (!cpu_has_callbacks_ready_to_invoke(rdp)) {
@@ -1553,9 +1553,9 @@ static void rcu_do_batch(struct rcu_state rsp, struct rcu_data rdp) · 16 unmodified lines
1553	rdp->nxtlist = *rdp->nxttail[RCU_DONE_TAIL];	1553	rdp->nxtlist = *rdp->nxttail[RCU_DONE_TAIL];
1554	*rdp->nxttail[RCU_DONE_TAIL] = NULL;	1554	*rdp->nxttail[RCU_DONE_TAIL] = NULL;
1555	tail = rdp->nxttail[RCU_DONE_TAIL];	1555	tail = rdp->nxttail[RCU_DONE_TAIL];
1556	for (count = RCU_NEXT_SIZE - 1; count >= 0; count--)	1556	for (i = RCU_NEXT_SIZE - 1; i >= 0; i--)
1557	if (rdp->nxttail[count] == rdp->nxttail[RCU_DONE_TAIL])	1557	if (rdp->nxttail[i] == rdp->nxttail[RCU_DONE_TAIL])
1558	rdp->nxttail[count] = &rdp->nxtlist;	1558	rdp->nxttail[i] = &rdp->nxtlist;
1559	local_irq_restore(flags);	1559	local_irq_restore(flags);
1560		1560
1561	/* Invoke callbacks. */	1561	/* Invoke callbacks. */
@@ -1583,9 +1583,9 @@ static void rcu_do_batch(struct rcu_state rsp, struct rcu_data rdp) · 21 unmodified lines
1583	if (list != NULL) {	1583	if (list != NULL) {
1584	*tail = rdp->nxtlist;	1584	*tail = rdp->nxtlist;
1585	rdp->nxtlist = list;	1585	rdp->nxtlist = list;
1586	for (count = 0; count < RCU_NEXT_SIZE; count++)	1586	for (i = 0; i < RCU_NEXT_SIZE; i++)
1587	if (&rdp->nxtlist == rdp->nxttail[count])	1587	if (&rdp->nxtlist == rdp->nxttail[i])
1588	rdp->nxttail[count] = tail;	1588	rdp->nxttail[i] = tail;
1589	else	1589	else
1590	break;	1590	break;
1591	}	1591	}

net/9p/protocol.c+1−1

@@ -368,7 +368,7 @@ p9pdu_vwritef(struct p9_fcall pdu, int proto_version, const char fmt, · 367 unmodified lines
368	const char sptr = va_arg(ap, const char );	368	const char sptr = va_arg(ap, const char );
369	uint16_t len = 0;	369	uint16_t len = 0;
370	if (sptr)	370	if (sptr)
371	len = min_t(uint16_t, strlen(sptr),	371	len = min_t(size_t, strlen(sptr),
372	USHRT_MAX);	372	USHRT_MAX);
373		373
374	errcode = p9pdu_writef(pdu, proto_version,	374	errcode = p9pdu_writef(pdu, proto_version,

net/batman-adv/routing.c+2−0

@@ -617,6 +617,8 @@ int recv_tt_query(struct sk_buff skb, struct hard_iface recv_if) · 616 unmodified lines
617	* changes */	617	* changes */
618	if (skb_linearize(skb) < 0)	618	if (skb_linearize(skb) < 0)
619	goto out;	619	goto out;
		620	/* skb_linearize() possibly changed skb->data */
		621	tt_query = (struct tt_query_packet *)skb->data;
620		622
621	tt_len = tt_query->tt_data * sizeof(struct tt_change);	623	tt_len = tt_query->tt_data * sizeof(struct tt_change);
622		624

net/batman-adv/translation-table.c+6−6

 	struct tt_orig_list_entry *orig_entry;
 	orig_entry = container_of(rcu, struct tt_orig_list_entry, rcu);
-	atomic_dec(&orig_entry->orig_node->tt_size);
 	orig_node_free_ref(orig_entry->orig_node);
 	kfree(orig_entry);
 }
 static void tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry)
 {
+	/* to avoid race conditions, immediately decrease the tt counter */
+	atomic_dec(&orig_entry->orig_node->tt_size);
 	call_rcu(&orig_entry->rcu, tt_orig_list_entry_free_rcu);
 }
 		}
 		spin_unlock_bh(list_lock);
 	}
-	atomic_set(&orig_node->tt_size, 0);
 	orig_node->tt_initialised = false;
 }
 {
 	struct tt_local_entry *tt_local_entry = NULL;
 	struct tt_global_entry *tt_global_entry = NULL;
-	bool ret = true;
+	bool ret = false;
 	if (!atomic_read(&bat_priv->ap_isolation))
-		return false;
+		goto out;
 	tt_local_entry = tt_local_hash_find(bat_priv, dst);
 	if (!tt_local_entry)
 	if (!tt_global_entry)
 		goto out;
-	if (_is_ap_isolated(tt_local_entry, tt_global_entry))
+	if (!_is_ap_isolated(tt_local_entry, tt_global_entry))
 		goto out;
-	ret = false;
+	ret = true;
 out:
 	if (tt_global_entry)

net/bluetooth/hci_event.c+48−0

@@ -3043,6 +3043,50 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct · 3042 unmodified lines
3043	hci_dev_unlock(hdev);	3043	hci_dev_unlock(hdev);
3044	}	3044	}
3045		3045
		3046	static void hci_key_refresh_complete_evt(struct hci_dev *hdev,
		3047	struct sk_buff *skb)
		3048	{
		3049	struct hci_ev_key_refresh_complete ev = (void ) skb->data;
		3050	struct hci_conn *conn;
		3051
		3052	BT_DBG("%s status %u handle %u", hdev->name, ev->status,
		3053	__le16_to_cpu(ev->handle));
		3054
		3055	hci_dev_lock(hdev);
		3056
		3057	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
		3058	if (!conn)
		3059	goto unlock;
		3060
		3061	if (!ev->status)
		3062	conn->sec_level = conn->pending_sec_level;
		3063
		3064	clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
		3065
		3066	if (ev->status && conn->state == BT_CONNECTED) {
		3067	hci_acl_disconn(conn, HCI_ERROR_AUTH_FAILURE);
		3068	hci_conn_put(conn);
		3069	goto unlock;
		3070	}
		3071
		3072	if (conn->state == BT_CONFIG) {
		3073	if (!ev->status)
		3074	conn->state = BT_CONNECTED;
		3075
		3076	hci_proto_connect_cfm(conn, ev->status);
		3077	hci_conn_put(conn);
		3078	} else {
		3079	hci_auth_cfm(conn, ev->status);
		3080
		3081	hci_conn_hold(conn);
		3082	conn->disc_timeout = HCI_DISCONN_TIMEOUT;
		3083	hci_conn_put(conn);
		3084	}
		3085
		3086	unlock:
		3087	hci_dev_unlock(hdev);
		3088	}
		3089
3046	static inline u8 hci_get_auth_req(struct hci_conn *conn)	3090	static inline u8 hci_get_auth_req(struct hci_conn *conn)
3047	{	3091	{
3048	/* If remote requests dedicated bonding follow that lead */	3092	/* If remote requests dedicated bonding follow that lead */
@@ -3559,6 +3603,10 @@ void hci_event_packet(struct hci_dev hdev, struct sk_buff skb) · 510 unmodified lines
3559	hci_extended_inquiry_result_evt(hdev, skb);	3603	hci_extended_inquiry_result_evt(hdev, skb);
3560	break;	3604	break;
3561		3605
		3606	case HCI_EV_KEY_REFRESH_COMPLETE:
		3607	hci_key_refresh_complete_evt(hdev, skb);
		3608	break;
		3609
3562	case HCI_EV_IO_CAPA_REQUEST:	3610	case HCI_EV_IO_CAPA_REQUEST:
3563	hci_io_capa_request_evt(hdev, skb);	3611	hci_io_capa_request_evt(hdev, skb);
3564	break;	3612	break;

net/bluetooth/hidp/Kconfig+1−1

@@ -1,6 +1,6 @@
1	config BT_HIDP	1	config BT_HIDP
2	tristate "HIDP protocol support"	2	tristate "HIDP protocol support"
3	depends on BT && INPUT && HID_SUPPORT	3	depends on BT && INPUT
4	select HID	4	select HID
5	help	5	help
6	HIDP (Human Interface Device Protocol) is a transport layer	6	HIDP (Human Interface Device Protocol) is a transport layer

net/bluetooth/l2cap_core.c+14−7

@@ -1295,7 +1295,12 @@ static void security_timeout(struct work_struct *work) · 1294 unmodified lines
1295	struct l2cap_conn *conn = container_of(work, struct l2cap_conn,	1295	struct l2cap_conn *conn = container_of(work, struct l2cap_conn,
1296	security_timer.work);	1296	security_timer.work);
1297		1297
1298	l2cap_conn_del(conn->hcon, ETIMEDOUT);	1298	BT_DBG("conn %p", conn);
		1299
		1300	if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags)) {
		1301	smp_chan_destroy(conn);
		1302	l2cap_conn_del(conn->hcon, ETIMEDOUT);
		1303	}
1299	}	1304	}
1300		1305
1301	static struct l2cap_conn l2cap_conn_add(struct hci_conn hcon, u8 status)	1306	static struct l2cap_conn l2cap_conn_add(struct hci_conn hcon, u8 status)
@@ -2910,12 +2915,14 @@ static void l2cap_conf_rfc_get(struct l2cap_chan chan, void rsp, int len) · 1608 unmodified lines
2910	while (len >= L2CAP_CONF_OPT_SIZE) {	2915	while (len >= L2CAP_CONF_OPT_SIZE) {
2911	len -= l2cap_get_conf_opt(&rsp, &type, &olen, &val);	2916	len -= l2cap_get_conf_opt(&rsp, &type, &olen, &val);
2912		2917
2913	switch (type) {	2918	if (type != L2CAP_CONF_RFC)
2914	case L2CAP_CONF_RFC:	2919	continue;
2915	if (olen == sizeof(rfc))	2920
2916	memcpy(&rfc, (void *)val, olen);	2921	if (olen != sizeof(rfc))
2917	goto done;	2922	break;
2918	}	2923
		2924	memcpy(&rfc, (void *)val, olen);
		2925	goto done;
2919	}	2926	}
2920		2927
2921	/* Use sane default values in case a misbehaving remote device	2928	/* Use sane default values in case a misbehaving remote device

net/bluetooth/mgmt.c+19−1

 	else
 		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);
-	if (!conn) {
+	if (!conn || conn->state == BT_OPEN || conn->state == BT_CLOSED) {
 		err = cmd_status(sk, hdev->id, MGMT_OP_DISCONNECT,
 				 MGMT_STATUS_NOT_CONNECTED);
 		goto failed;
 		pairing_complete(cmd, mgmt_status(status));
 }
+static void le_connect_complete_cb(struct hci_conn *conn, u8 status)
+{
+	struct pending_cmd *cmd;
+	BT_DBG("status %u", status);
+	if (!status)
+		return;
+	cmd = find_pairing(conn);
+	if (!cmd)
+		BT_DBG("Unable to find a pending command");
+	else
+		pairing_complete(cmd, mgmt_status(status));
+}
 static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
 		       u16 len)
 {
 	/* For LE, just connecting isn't a proof that the pairing finished */
 	if (cp->addr.type == BDADDR_BREDR)
 		conn->connect_cfm_cb = pairing_complete_cb;
+	else
+		conn->connect_cfm_cb = le_connect_complete_cb;
 	conn->security_cfm_cb = pairing_complete_cb;
 	conn->disconn_cfm_cb = pairing_complete_cb;

net/bluetooth/smp.c+7−4

 	auth |= (req->auth_req | rsp->auth_req) & SMP_AUTH_MITM;
-	ret = tk_request(conn, 0, auth, rsp->io_capability, req->io_capability);
+	ret = tk_request(conn, 0, auth, req->io_capability, rsp->io_capability);
 	if (ret)
 		return SMP_UNSPECIFIED;
 	return 0;
 }
-static u8 smp_ltk_encrypt(struct l2cap_conn *conn)
+static u8 smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level)
 {
 	struct smp_ltk *key;
 	struct hci_conn *hcon = conn->hcon;
 	if (!key)
 		return 0;
+	if (sec_level > BT_SECURITY_MEDIUM && !key->authenticated)
+		return 0;
 	if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &hcon->flags))
 		return 1;
 	hcon->pending_sec_level = authreq_to_seclevel(rp->auth_req);
-	if (smp_ltk_encrypt(conn))
+	if (smp_ltk_encrypt(conn, hcon->pending_sec_level))
 		return 0;
 	if (test_and_set_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags))
 		return 1;
 	if (hcon->link_mode & HCI_LM_MASTER)
-		if (smp_ltk_encrypt(conn))
+		if (smp_ltk_encrypt(conn, sec_level))
 			goto done;
 	if (test_and_set_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags))

net/bridge/br_if.c+1−0

@@ -240,6 +240,7 @@ int br_add_bridge(struct net net, const char name) · 239 unmodified lines
240	return -ENOMEM;	240	return -ENOMEM;
241		241
242	dev_net_set(dev, net);	242	dev_net_set(dev, net);
		243	dev->rtnl_link_ops = &br_link_ops;
243		244
244	res = register_netdev(dev);	245	res = register_netdev(dev);
245	if (res)	246	if (res)

net/bridge/br_netlink.c+1−1

@@ -208,7 +208,7 @@ static int br_validate(struct nlattr tb[], struct nlattr data[]) · 207 unmodified lines
208	return 0;	208	return 0;
209	}	209	}
210		210
211	static struct rtnl_link_ops br_link_ops __read_mostly = {	211	struct rtnl_link_ops br_link_ops __read_mostly = {
212	.kind = "bridge",	212	.kind = "bridge",
213	.priv_size = sizeof(struct net_bridge),	213	.priv_size = sizeof(struct net_bridge),
214	.setup = br_dev_setup,	214	.setup = br_dev_setup,

net/bridge/br_private.h+1−0

@@ -549,6 +549,7 @@ extern int (br_fdb_test_addr_hook)(struct net_device dev, unsigned char *addr) · 548 unmodified lines
549	#endif	549	#endif
550		550
551	/* br_netlink.c */	551	/* br_netlink.c */
		552	extern struct rtnl_link_ops br_link_ops;
552	extern int br_netlink_init(void);	553	extern int br_netlink_init(void);
553	extern void br_netlink_fini(void);	554	extern void br_netlink_fini(void);
554	extern void br_ifinfo_notify(int event, struct net_bridge_port *port);	555	extern void br_ifinfo_notify(int event, struct net_bridge_port *port);

net/caif/caif_dev.c+1−2

@@ -4,8 +4,7 @@ · 3 unmodified lines
4	* Author: Sjur Brendeland/sjur.brandeland@stericsson.com	4	* Author: Sjur Brendeland/sjur.brandeland@stericsson.com
5	* License terms: GNU General Public License (GPL) version 2	5	* License terms: GNU General Public License (GPL) version 2
6	*	6	*
7	* Borrowed heavily from file: pn_dev.c. Thanks to	7	* Borrowed heavily from file: pn_dev.c. Thanks to Remi Denis-Courmont
8	* Remi Denis-Courmont <remi.denis-courmont@nokia.com>
9	* and Sakari Ailus <sakari.ailus@nokia.com>	8	* and Sakari Ailus <sakari.ailus@nokia.com>
10	*/	9	*/
11		10

net/caif/caif_socket.c+1−0

@@ -220,6 +220,7 @@ static void caif_ctrl_cb(struct cflayer *layr, · 219 unmodified lines
220	cfsk_hold, cfsk_put);	220	cfsk_hold, cfsk_put);
221	cf_sk->sk.sk_state = CAIF_CONNECTED;	221	cf_sk->sk.sk_state = CAIF_CONNECTED;
222	set_tx_flow_on(cf_sk);	222	set_tx_flow_on(cf_sk);
		223	cf_sk->sk.sk_shutdown = 0;
223	cf_sk->sk.sk_state_change(&cf_sk->sk);	224	cf_sk->sk.sk_state_change(&cf_sk->sk);
224	break;	225	break;
225		226

net/can/raw.c+0−3

@@ -681,9 +681,6 @@ static int raw_sendmsg(struct kiocb iocb, struct socket sock, · 680 unmodified lines
681	if (err < 0)	681	if (err < 0)
682	goto free_skb;	682	goto free_skb;
683		683
684	/* to be able to check the received tx sock reference in raw_rcv() */
685	skb_shinfo(skb)->tx_flags \|= SKBTX_DRV_NEEDS_SK_REF;
686
687	skb->dev = dev;	684	skb->dev = dev;
688	skb->sk = sk;	685	skb->sk = sk;
689		686

net/core/dev.c+1−22

@@ -2089,25 +2089,6 @@ static int dev_gso_segment(struct sk_buff *skb, netdev_features_t features) · 2088 unmodified lines
2089	return 0;	2089	return 0;
2090	}	2090	}
2091		2091
2092	/*
2093	* Try to orphan skb early, right before transmission by the device.
2094	* We cannot orphan skb if tx timestamp is requested or the sk-reference
2095	* is needed on driver level for other reasons, e.g. see net/can/raw.c
2096	*/
2097	static inline void skb_orphan_try(struct sk_buff *skb)
2098	{
2099	struct sock *sk = skb->sk;
2100
2101	if (sk && !skb_shinfo(skb)->tx_flags) {
2102	/* skb_tx_hash() wont be able to get sk.
2103	* We copy sk_hash into skb->rxhash
2104	*/
2105	if (!skb->rxhash)
2106	skb->rxhash = sk->sk_hash;
2107	skb_orphan(skb);
2108	}
2109	}
2110
2111	static bool can_checksum_protocol(netdev_features_t features, __be16 protocol)	2092	static bool can_checksum_protocol(netdev_features_t features, __be16 protocol)
2112	{	2093	{
2113	return ((features & NETIF_F_GEN_CSUM) \|\|	2094	return ((features & NETIF_F_GEN_CSUM) \|\|
@@ -2193,8 +2174,6 @@ int dev_hard_start_xmit(struct sk_buff skb, struct net_device dev, · 79 unmodified lines
2193	if (!list_empty(&ptype_all))	2174	if (!list_empty(&ptype_all))
2194	dev_queue_xmit_nit(skb, dev);	2175	dev_queue_xmit_nit(skb, dev);
2195		2176
2196	skb_orphan_try(skb);
2197
2198	features = netif_skb_features(skb);	2177	features = netif_skb_features(skb);
2199		2178
2200	if (vlan_tx_tag_present(skb) &&	2179	if (vlan_tx_tag_present(skb) &&
@@ -2304,7 +2283,7 @@ u16 __skb_tx_hash(const struct net_device dev, const struct sk_buff skb, · 103 unmodified lines
2304	if (skb->sk && skb->sk->sk_hash)	2283	if (skb->sk && skb->sk->sk_hash)
2305	hash = skb->sk->sk_hash;	2284	hash = skb->sk->sk_hash;
2306	else	2285	else
2307	hash = (__force u16) skb->protocol ^ skb->rxhash;	2286	hash = (__force u16) skb->protocol;
2308	hash = jhash_1word(hash, hashrnd);	2287	hash = jhash_1word(hash, hashrnd);
2309		2288
2310	return (u16) (((u64) hash * qcount) >> 32) + qoffset;	2289	return (u16) (((u64) hash * qcount) >> 32) + qoffset;

net/ipv6/ip6_fib.c+2−2

@@ -1349,8 +1349,8 @@ static int fib6_walk_continue(struct fib6_walker_t *w) · 1348 unmodified lines
1349	if (w->leaf && fn->fn_flags & RTN_RTINFO) {	1349	if (w->leaf && fn->fn_flags & RTN_RTINFO) {
1350	int err;	1350	int err;
1351		1351
1352	if (w->count < w->skip) {	1352	if (w->skip) {
1353	w->count++;	1353	w->skip--;
1354	continue;	1354	continue;
1355	}	1355	}
1356		1356

net/ipv6/route.c+31−10

 	net->ipv6.sysctl.ip6_rt_mtu_expires = 10*60*HZ;
 	net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;
-#ifdef CONFIG_PROC_FS
-	proc_net_fops_create(net, "ipv6_route", 0, &ipv6_route_proc_fops);
-	proc_net_fops_create(net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
-#endif
 	net->ipv6.ip6_rt_gc_expire = 30*HZ;
 	ret = 0;
 static void __net_exit ip6_route_net_exit(struct net *net)
 {
-#ifdef CONFIG_PROC_FS
-	proc_net_remove(net, "ipv6_route");
-	proc_net_remove(net, "rt6_stats");
-#endif
 	kfree(net->ipv6.ip6_null_entry);
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
 	kfree(net->ipv6.ip6_prohibit_entry);
 	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
 }
+static int __net_init ip6_route_net_init_late(struct net *net)
+{
+#ifdef CONFIG_PROC_FS
+	proc_net_fops_create(net, "ipv6_route", 0, &ipv6_route_proc_fops);
+	proc_net_fops_create(net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
+#endif
+	return 0;
+}
+static void __net_exit ip6_route_net_exit_late(struct net *net)
+{
+#ifdef CONFIG_PROC_FS
+	proc_net_remove(net, "ipv6_route");
+	proc_net_remove(net, "rt6_stats");
+#endif
+}
 static struct pernet_operations ip6_route_net_ops = {
 	.init = ip6_route_net_init,
 	.exit = ip6_route_net_exit,
 };
+static struct pernet_operations ip6_route_net_late_ops = {
+	.init = ip6_route_net_init_late,
+	.exit = ip6_route_net_exit_late,
+};
 static struct notifier_block ip6_route_dev_notifier = {
 	.notifier_call = ip6_route_dev_notify,
 	.priority = 0,
 	if (ret)
 		goto xfrm6_init;
+	ret = register_pernet_subsys(&ip6_route_net_late_ops);
+	if (ret)
+		goto fib6_rules_init;
 	ret = -ENOBUFS;
 	if (__rtnl_register(PF_INET6, RTM_NEWROUTE, inet6_rtm_newroute, NULL, NULL) ||
 	    __rtnl_register(PF_INET6, RTM_DELROUTE, inet6_rtm_delroute, NULL, NULL) ||
 	    __rtnl_register(PF_INET6, RTM_GETROUTE, inet6_rtm_getroute, NULL, NULL))
-		goto fib6_rules_init;
+		goto out_register_late_subsys;
 	ret = register_netdevice_notifier(&ip6_route_dev_notifier);
 	if (ret)
-		goto fib6_rules_init;
+		goto out_register_late_subsys;
 out:
 	return ret;
+out_register_late_subsys:
+	unregister_pernet_subsys(&ip6_route_net_late_ops);
 fib6_rules_init:
 	fib6_rules_cleanup();
 xfrm6_init:
 void ip6_route_cleanup(void)
 {
 	unregister_netdevice_notifier(&ip6_route_dev_notifier);
+	unregister_pernet_subsys(&ip6_route_net_late_ops);
 	fib6_rules_cleanup();
 	xfrm6_fini();
 	fib6_gc_cleanup();

net/ipv6/tcp_ipv6.c+2−1

@@ -1212,7 +1212,8 @@ have_isn: · 1211 unmodified lines
1212	tcp_rsk(req)->snt_isn = isn;	1212	tcp_rsk(req)->snt_isn = isn;
1213	tcp_rsk(req)->snt_synack = tcp_time_stamp;	1213	tcp_rsk(req)->snt_synack = tcp_time_stamp;
1214		1214
1215	security_inet_conn_request(sk, skb, req);	1215	if (security_inet_conn_request(sk, skb, req))
		1216	goto drop_and_release;
1216		1217
1217	if (tcp_v6_send_synack(sk, req,	1218	if (tcp_v6_send_synack(sk, req,
1218	(struct request_values *)&tmp_ext,	1219	(struct request_values *)&tmp_ext,

net/iucv/af_iucv.c+0−1

@@ -372,7 +372,6 @@ static int afiucv_hs_send(struct iucv_message imsg, struct sock sock, · 371 unmodified lines
372	skb_trim(skb, skb->dev->mtu);	372	skb_trim(skb, skb->dev->mtu);
373	}	373	}
374	skb->protocol = ETH_P_AF_IUCV;	374	skb->protocol = ETH_P_AF_IUCV;
375	skb_shinfo(skb)->tx_flags \|= SKBTX_DRV_NEEDS_SK_REF;
376	nskb = skb_clone(skb, GFP_ATOMIC);	375	nskb = skb_clone(skb, GFP_ATOMIC);
377	if (!nskb)	376	if (!nskb)
378	return -ENOMEM;	377	return -ENOMEM;

net/l2tp/l2tp_eth.c+33−12

@@ -42,6 +42,11 @@ struct l2tp_eth { · 41 unmodified lines
42	struct sock *tunnel_sock;	42	struct sock *tunnel_sock;
43	struct l2tp_session *session;	43	struct l2tp_session *session;
44	struct list_head list;	44	struct list_head list;
		45	atomic_long_t tx_bytes;
		46	atomic_long_t tx_packets;
		47	atomic_long_t rx_bytes;
		48	atomic_long_t rx_packets;
		49	atomic_long_t rx_errors;
45	};	50	};
46		51
47	/* via l2tp_session_priv() */	52	/* via l2tp_session_priv() */
@@ -88,24 +93,40 @@ static int l2tp_eth_dev_xmit(struct sk_buff skb, struct net_device dev) · 40 unmodified lines
88	struct l2tp_eth *priv = netdev_priv(dev);	93	struct l2tp_eth *priv = netdev_priv(dev);
89	struct l2tp_session *session = priv->session;	94	struct l2tp_session *session = priv->session;
90		95
		96	atomic_long_add(skb->len, &priv->tx_bytes);
		97	atomic_long_inc(&priv->tx_packets);
		98
91	l2tp_xmit_skb(session, skb, session->hdr_len);	99	l2tp_xmit_skb(session, skb, session->hdr_len);
92		100
93	dev->stats.tx_bytes += skb->len;	101	return NETDEV_TX_OK;
94	dev->stats.tx_packets++;	102	}
95		103
96	return 0;	104	static struct rtnl_link_stats64 l2tp_eth_get_stats64(struct net_device dev,
		105	struct rtnl_link_stats64 *stats)
		106	{
		107	struct l2tp_eth *priv = netdev_priv(dev);
		108
		109	stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
		110	stats->tx_packets = atomic_long_read(&priv->tx_packets);
		111	stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
		112	stats->rx_packets = atomic_long_read(&priv->rx_packets);
		113	stats->rx_errors = atomic_long_read(&priv->rx_errors);
		114	return stats;
97	}	115	}
98		116
		117
99	static struct net_device_ops l2tp_eth_netdev_ops = {	118	static struct net_device_ops l2tp_eth_netdev_ops = {
100	.ndo_init = l2tp_eth_dev_init,	119	.ndo_init = l2tp_eth_dev_init,
101	.ndo_uninit = l2tp_eth_dev_uninit,	120	.ndo_uninit = l2tp_eth_dev_uninit,
102	.ndo_start_xmit = l2tp_eth_dev_xmit,	121	.ndo_start_xmit = l2tp_eth_dev_xmit,
		122	.ndo_get_stats64 = l2tp_eth_get_stats64,
103	};	123	};
104		124
105	static void l2tp_eth_dev_setup(struct net_device *dev)	125	static void l2tp_eth_dev_setup(struct net_device *dev)
106	{	126	{
107	ether_setup(dev);	127	ether_setup(dev);
108	dev->priv_flags &= ~IFF_TX_SKB_SHARING;	128	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
		129	dev->features \|= NETIF_F_LLTX;
109	dev->netdev_ops = &l2tp_eth_netdev_ops;	130	dev->netdev_ops = &l2tp_eth_netdev_ops;
110	dev->destructor = free_netdev;	131	dev->destructor = free_netdev;
111	}	132	}
@@ -114,17 +135,17 @@ static void l2tp_eth_dev_recv(struct l2tp_session session, struct sk_buff skb, · 2 unmodified lines
114	{	135	{
115	struct l2tp_eth_sess *spriv = l2tp_session_priv(session);	136	struct l2tp_eth_sess *spriv = l2tp_session_priv(session);
116	struct net_device *dev = spriv->dev;	137	struct net_device *dev = spriv->dev;
		138	struct l2tp_eth *priv = netdev_priv(dev);
117		139
118	if (session->debug & L2TP_MSG_DATA) {	140	if (session->debug & L2TP_MSG_DATA) {
119	unsigned int length;	141	unsigned int length;
120	u8 *ptr = skb->data;
121		142
122	length = min(32u, skb->len);	143	length = min(32u, skb->len);
123	if (!pskb_may_pull(skb, length))	144	if (!pskb_may_pull(skb, length))
124	goto error;	145	goto error;
125		146
126	pr_debug("%s: eth recv\n", session->name);	147	pr_debug("%s: eth recv\n", session->name);
127	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);	148	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, skb->data, length);
128	}	149	}
129		150
130	if (!pskb_may_pull(skb, sizeof(ETH_HLEN)))	151	if (!pskb_may_pull(skb, sizeof(ETH_HLEN)))
@@ -139,15 +160,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session session, struct sk_buff skb, · 8 unmodified lines
139	nf_reset(skb);	160	nf_reset(skb);
140		161
141	if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {	162	if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
142	dev->stats.rx_packets++;	163	atomic_long_inc(&priv->rx_packets);
143	dev->stats.rx_bytes += data_len;	164	atomic_long_add(data_len, &priv->rx_bytes);
144	} else	165	} else {
145	dev->stats.rx_errors++;	166	atomic_long_inc(&priv->rx_errors);
146		167	}
147	return;	168	return;
148		169
149	error:	170	error:
150	dev->stats.rx_errors++;	171	atomic_long_inc(&priv->rx_errors);
151	kfree_skb(skb);	172	kfree_skb(skb);
152	}	173	}
153		174

net/mac80211/cfg.c+3−0

@@ -2093,6 +2093,9 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy, · 2092 unmodified lines
2093	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);	2093	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
2094	int i, ret;	2094	int i, ret;
2095		2095
		2096	if (!ieee80211_sdata_running(sdata))
		2097	return -ENETDOWN;
		2098
2096	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {	2099	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
2097	ret = drv_set_bitrate_mask(local, sdata, mask);	2100	ret = drv_set_bitrate_mask(local, sdata, mask);
2098	if (ret)	2101	if (ret)

net/mac80211/mlme.c+2−2

 	if (WARN_ON(!ifmgd->associated))
 		return;
+	ieee80211_stop_poll(sdata);
 	memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);
 	ifmgd->associated = NULL;
 	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 	u8 frame_buf[DEAUTH_DISASSOC_LEN];
-	ieee80211_stop_poll(sdata);
 	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
 			       false, frame_buf);
 	mutex_unlock(&ifmgd->mtx);

net/mac80211/sta_info.h+5−0

  * @plink_timer: peer link watch timer
  * @plink_timer_was_running: used by suspend/resume to restore timers
  * @t_offset: timing offset relative to this host
+ * @t_offset_setpoint: reference timing offset of this sta to be used when
+ * 	calculating clockdrift
+ * @ch_type: peer's channel type
  * @debugfs: debug filesystem info
  * @dead: set to true when sta is unlinked
  * @uploaded: set to true when sta is uploaded to the driver
  * @sta: station information we share with the driver
  * @sta_state: duplicates information about station state (for debug)
  * @beacon_loss_count: number of times beacon loss has triggered
+ * @supports_40mhz: tracks whether the station advertised 40 MHz support
+ *	as we overwrite its HT parameters with the currently used value
  */
 struct sta_info {
 	/* General information, mostly static */

net/mac802154/tx.c+2−1

 {
 	struct xmit_work *work;
-	if (!(priv->phy->channels_supported[page] & (1 << chan)))
+	if (!(priv->phy->channels_supported[page] & (1 << chan))) {
 		WARN_ON(1);
 		return NETDEV_TX_OK;
+	}
 	if (!(priv->hw.flags & IEEE802154_HW_OMIT_CKSUM)) {
 		u16 crc = crc_ccitt(0, skb->data, skb->len);

net/phonet/af_phonet.c+2−2

@@ -5,8 +5,8 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Contact: Remi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Authors: Sakari Ailus <sakari.ailus@nokia.com>
9	* Original author: Sakari Ailus <sakari.ailus@nokia.com>	9	* Rémi Denis-Courmont
10	*	10	*
11	* This program is free software; you can redistribute it and/or	11	* This program is free software; you can redistribute it and/or
12	* modify it under the terms of the GNU General Public License	12	* modify it under the terms of the GNU General Public License

net/phonet/datagram.c+2−2

@@ -5,8 +5,8 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Contact: Remi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Authors: Sakari Ailus <sakari.ailus@nokia.com>
9	* Original author: Sakari Ailus <sakari.ailus@nokia.com>	9	* Rémi Denis-Courmont
10	*	10	*
11	* This program is free software; you can redistribute it and/or	11	* This program is free software; you can redistribute it and/or
12	* modify it under the terms of the GNU General Public License	12	* modify it under the terms of the GNU General Public License

net/phonet/pep-gprs.c+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Author: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Author: Rémi Denis-Courmont
9	*	9	*
10	* This program is free software; you can redistribute it and/or	10	* This program is free software; you can redistribute it and/or
11	* modify it under the terms of the GNU General Public License	11	* modify it under the terms of the GNU General Public License

net/phonet/pep.c+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Author: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Author: Rémi Denis-Courmont
9	*	9	*
10	* This program is free software; you can redistribute it and/or	10	* This program is free software; you can redistribute it and/or
11	* modify it under the terms of the GNU General Public License	11	* modify it under the terms of the GNU General Public License

net/phonet/pn_dev.c+2−2

@@ -5,8 +5,8 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Contact: Remi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Authors: Sakari Ailus <sakari.ailus@nokia.com>
9	* Original author: Sakari Ailus <sakari.ailus@nokia.com>	9	* Rémi Denis-Courmont
10	*	10	*
11	* This program is free software; you can redistribute it and/or	11	* This program is free software; you can redistribute it and/or
12	* modify it under the terms of the GNU General Public License	12	* modify it under the terms of the GNU General Public License

net/phonet/pn_netlink.c+2−2

@@ -5,8 +5,8 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Contact: Remi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Authors: Sakari Ailus <sakari.ailus@nokia.com>
9	* Original author: Sakari Ailus <sakari.ailus@nokia.com>	9	* Remi Denis-Courmont
10	*	10	*
11	* This program is free software; you can redistribute it and/or	11	* This program is free software; you can redistribute it and/or
12	* modify it under the terms of the GNU General Public License	12	* modify it under the terms of the GNU General Public License

net/phonet/socket.c+2−2

@@ -5,8 +5,8 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Contact: Remi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Authors: Sakari Ailus <sakari.ailus@nokia.com>
9	* Original author: Sakari Ailus <sakari.ailus@nokia.com>	9	* Rémi Denis-Courmont
10	*	10	*
11	* This program is free software; you can redistribute it and/or	11	* This program is free software; you can redistribute it and/or
12	* modify it under the terms of the GNU General Public License	12	* modify it under the terms of the GNU General Public License

net/phonet/sysctl.c+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	*	5	*
6	* Copyright (C) 2008 Nokia Corporation.	6	* Copyright (C) 2008 Nokia Corporation.
7	*	7	*
8	* Contact: Remi Denis-Courmont <remi.denis-courmont@nokia.com>	8	* Author: Rémi Denis-Courmont
9	*	9	*
10	* This program is free software; you can redistribute it and/or	10	* This program is free software; you can redistribute it and/or
11	* modify it under the terms of the GNU General Public License	11	* modify it under the terms of the GNU General Public License

net/sctp/protocol.c+2−0

 				SCTP_DEBUG_PRINTK("sctp_addrwq_timo_handler: sctp_asconf_mgmt failed\n");
 			sctp_bh_unlock_sock(sk);
 		}
+#if IS_ENABLED(CONFIG_IPV6)
 free_next:
+#endif
 		list_del(&addrw->list);
 		kfree(addrw);
 	}

net/wireless/reg.c+1−1

@@ -1389,7 +1389,7 @@ static void reg_set_request_processed(void) · 1388 unmodified lines
1389	spin_unlock(&reg_requests_lock);	1389	spin_unlock(&reg_requests_lock);
1390		1390
1391	if (last_request->initiator == NL80211_REGDOM_SET_BY_USER)	1391	if (last_request->initiator == NL80211_REGDOM_SET_BY_USER)
1392	cancel_delayed_work_sync(&reg_timeout);	1392	cancel_delayed_work(&reg_timeout);
1393		1393
1394	if (need_more_processing)	1394	if (need_more_processing)
1395	schedule_work(&reg_work);	1395	schedule_work(&reg_work);

net/wireless/util.c+1−1

@@ -804,7 +804,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, · 803 unmodified lines
804	ntype == NL80211_IFTYPE_P2P_CLIENT))	804	ntype == NL80211_IFTYPE_P2P_CLIENT))
805	return -EBUSY;	805	return -EBUSY;
806		806
807	if (ntype != otype) {	807	if (ntype != otype && netif_running(dev)) {
808	err = cfg80211_can_change_interface(rdev, dev->ieee80211_ptr,	808	err = cfg80211_can_change_interface(rdev, dev->ieee80211_ptr,
809	ntype);	809	ntype);
810	if (err)	810	if (err)

scripts/gfp-translate+0−0

File mode changed from 100644 to 100755.

sound/i2c/other/tea575x-tuner.c+14−7

 MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");
 MODULE_LICENSE("GPL");
-#define FREQ_LO		 (76U * 16000)
+#define FREQ_LO		((tea->tea5759 ? 760 :  875) * 1600U)
-#define FREQ_HI		(108U * 16000)
+#define FREQ_HI		((tea->tea5759 ? 910 : 1080) * 1600U)
 /*
  * definitions
 	return data;
 }
-static u32 snd_tea575x_get_freq(struct snd_tea575x *tea)
+static u32 snd_tea575x_val_to_freq(struct snd_tea575x *tea, u32 val)
 {
-	u32 freq = snd_tea575x_read(tea) & TEA575X_BIT_FREQ_MASK;
+	u32 freq = val & TEA575X_BIT_FREQ_MASK;
 	if (freq == 0)
 		return freq;
 	return clamp(freq * 16, FREQ_LO, FREQ_HI); /* from kHz */
 }
+static u32 snd_tea575x_get_freq(struct snd_tea575x *tea)
+{
+	return snd_tea575x_val_to_freq(tea, snd_tea575x_read(tea));
+}
 static void snd_tea575x_set_freq(struct snd_tea575x *tea)
 {
 	u32 freq = tea->freq;
 	tea->val &= ~TEA575X_BIT_FREQ_MASK;
 	tea->val |= freq & TEA575X_BIT_FREQ_MASK;
 	snd_tea575x_write(tea, tea->val);
+	tea->freq = snd_tea575x_val_to_freq(tea, tea->val);
 }
 /*
 }
 static const struct v4l2_file_operations tea575x_fops = {
-	.owner		= THIS_MODULE,
 	.unlocked_ioctl	= video_ioctl2,
 	.open           = v4l2_fh_open,
 	.release        = v4l2_fh_release,
 };
 static const struct video_device tea575x_radio = {
-	.fops           = &tea575x_fops,
 	.ioctl_ops 	= &tea575x_ioctl_ops,
 	.release        = video_device_release_empty,
 };
 /*
  * initialize all the tea575x chips
  */
-int snd_tea575x_init(struct snd_tea575x *tea)
+int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner)
 {
 	int retval;
 	tea->vd.lock = &tea->mutex;
 	tea->vd.v4l2_dev = tea->v4l2_dev;
 	tea->vd.ctrl_handler = &tea->ctrl_handler;
+	tea->fops = tea575x_fops;
+	tea->fops.owner = owner;
+	tea->vd.fops = &tea->fops;
 	set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);
 	/* disable hw_freq_seek if we can't use it */
 	if (tea->cannot_read_data)

sound/pci/es1968.c+1−1

@@ -2769,7 +2769,7 @@ static int __devinit snd_es1968_create(struct snd_card *card, · 2768 unmodified lines
2769	chip->tea.ops = &snd_es1968_tea_ops;	2769	chip->tea.ops = &snd_es1968_tea_ops;
2770	strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card));	2770	strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card));
2771	sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));	2771	sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
2772	if (!snd_tea575x_init(&chip->tea))	2772	if (!snd_tea575x_init(&chip->tea, THIS_MODULE))
2773	printk(KERN_INFO "es1968: detected TEA575x radio\n");	2773	printk(KERN_INFO "es1968: detected TEA575x radio\n");
2774	#endif	2774	#endif
2775		2775

sound/pci/fm801.c+2−2

@@ -1254,7 +1254,7 @@ static int __devinit snd_fm801_create(struct snd_card *card, · 1253 unmodified lines
1254	sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));	1254	sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
1255	if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&	1255	if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&
1256	(tea575x_tuner & TUNER_TYPE_MASK) < 4) {	1256	(tea575x_tuner & TUNER_TYPE_MASK) < 4) {
1257	if (snd_tea575x_init(&chip->tea)) {	1257	if (snd_tea575x_init(&chip->tea, THIS_MODULE)) {
1258	snd_printk(KERN_ERR "TEA575x radio not found\n");	1258	snd_printk(KERN_ERR "TEA575x radio not found\n");
1259	snd_fm801_free(chip);	1259	snd_fm801_free(chip);
1260	return -ENODEV;	1260	return -ENODEV;
@@ -1263,7 +1263,7 @@ static int __devinit snd_fm801_create(struct snd_card *card, · 2 unmodified lines
1263	/* autodetect tuner connection */	1263	/* autodetect tuner connection */
1264	for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) {	1264	for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) {
1265	chip->tea575x_tuner = tea575x_tuner;	1265	chip->tea575x_tuner = tea575x_tuner;
1266	if (!snd_tea575x_init(&chip->tea)) {	1266	if (!snd_tea575x_init(&chip->tea, THIS_MODULE)) {
1267	snd_printk(KERN_INFO "detected TEA575x radio type %s\n",	1267	snd_printk(KERN_INFO "detected TEA575x radio type %s\n",
1268	get_tea575x_gpio(chip)->name);	1268	get_tea575x_gpio(chip)->name);
1269	break;	1269	break;

sound/pci/hda/Kconfig+0−13

@@ -97,19 +97,6 @@ config SND_HDA_CODEC_REALTEK · 96 unmodified lines
97	snd-hda-codec-realtek.	97	snd-hda-codec-realtek.
98	This module is automatically loaded at probing.	98	This module is automatically loaded at probing.
99		99
100	config SND_HDA_ENABLE_REALTEK_QUIRKS
101	bool "Build static quirks for Realtek codecs"
102	depends on SND_HDA_CODEC_REALTEK
103	default y
104	help
105	Say Y here to build the static quirks codes for Realtek codecs.
106	If you need the "model" preset that the default BIOS auto-parser
107	can't handle, turn this option on.
108
109	If your device works with model=auto option, basically you don't
110	need the quirk code. By turning this off, you can reduce the
111	module size quite a lot.
112
113	config SND_HDA_CODEC_ANALOG	100	config SND_HDA_CODEC_ANALOG
114	bool "Build Analog Device HD-audio codec support"	101	bool "Build Analog Device HD-audio codec support"
115	default y	102	default y

sound/pci/hda/hda_auto_parser.c+0−1

@@ -618,7 +618,6 @@ int snd_hda_gen_add_verbs(struct hda_gen_spec *spec, · 617 unmodified lines
618	const struct hda_verb *list)	618	const struct hda_verb *list)
619	{	619	{
620	const struct hda_verb **v;	620	const struct hda_verb **v;
621	snd_array_init(&spec->verbs, sizeof(struct hda_verb *), 8);
622	v = snd_array_new(&spec->verbs);	621	v = snd_array_new(&spec->verbs);
623	if (!v)	622	if (!v)
624	return -ENOMEM;	623	return -ENOMEM;

sound/pci/hda/hda_auto_parser.h+10−0

@@ -157,4 +157,14 @@ void snd_hda_pick_fixup(struct hda_codec *codec, · 156 unmodified lines
157	const struct snd_pci_quirk *quirk,	157	const struct snd_pci_quirk *quirk,
158	const struct hda_fixup *fixlist);	158	const struct hda_fixup *fixlist);
159		159
		160	static inline void snd_hda_gen_init(struct hda_gen_spec *spec)
		161	{
		162	snd_array_init(&spec->verbs, sizeof(struct hda_verb *), 8);
		163	}
		164
		165	static inline void snd_hda_gen_free(struct hda_gen_spec *spec)
		166	{
		167	snd_array_free(&spec->verbs);
		168	}
		169
160	#endif /* __SOUND_HDA_AUTO_PARSER_H */	170	#endif /* __SOUND_HDA_AUTO_PARSER_H */

sound/pci/hda/hda_codec.c+4−0

 {
 	if (!codec)
 		return;
+	snd_hda_jack_tbl_clear(codec);
 	restore_init_pincfgs(codec);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 	cancel_delayed_work(&codec->power_work);
 	list_del(&codec->list);
 	snd_array_free(&codec->mixers);
 	snd_array_free(&codec->nids);
+	snd_array_free(&codec->cvt_setups);
 	snd_array_free(&codec->conn_lists);
 	snd_array_free(&codec->spdif_out);
 	codec->bus->caddr_tbl[codec->addr] = NULL;
 	/* free only driver_pins so that init_pins + user_pins are restored */
 	snd_array_free(&codec->driver_pins);
 	restore_pincfgs(codec);
+	snd_array_free(&codec->cvt_setups);
+	snd_array_free(&codec->spdif_out);
 	codec->num_pcms = 0;
 	codec->pcm_info = NULL;
 	codec->preset = NULL;

sound/pci/hda/patch_conexant.c+5−1

 static void conexant_free(struct hda_codec *codec)
 {
+	struct conexant_spec *spec = codec->spec;
+	snd_hda_gen_free(&spec->gen);
 	snd_hda_detach_beep_device(codec);
-	kfree(codec->spec);
+	kfree(spec);
 }
 static const struct snd_kcontrol_new cxt_capture_mixers[] = {
 	SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),
 	SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),
 	SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
+	SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
 	{}
 };
 	if (!spec)
 		return -ENOMEM;
 	codec->spec = spec;
+	snd_hda_gen_init(&spec->gen);
 	switch (codec->vendor_id) {
 	case 0x14f15045:

sound/pci/hda/patch_realtek.c+9−6

 	alc_shutup(codec);
 	alc_free_kctls(codec);
 	alc_free_bind_ctls(codec);
+	snd_hda_gen_free(&spec->gen);
 	kfree(spec);
 	snd_hda_detach_beep_device(codec);
 }
 		return -ENOMEM;
 	codec->spec = spec;
 	spec->mixer_nid = mixer_nid;
+	snd_hda_gen_init(&spec->gen);
 	err = alc_codec_rename_from_preset(codec);
 	if (err < 0) {
 	alc_fix_pll_init(codec, 0x20, 0x04, 15);
+	alc_pick_fixup(codec, alc662_fixup_models,
+		       alc662_fixup_tbl, alc662_fixups);
+	alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+	alc_auto_parse_customize_define(codec);
 	if ((alc_get_coef0(codec) & (1 << 14)) &&
 	    codec->bus->pci->subsystem_vendor == 0x1025 &&
 	    spec->cdefine.platform_type == 1) {
 			goto error;
 	}
-	alc_pick_fixup(codec, alc662_fixup_models,
-		       alc662_fixup_tbl, alc662_fixups);
-	alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
-	alc_auto_parse_customize_define(codec);
 	/* automatic parse from the BIOS config */
 	err = alc662_parse_auto_config(codec);
 	if (err < 0)
 	{ .id = 0x10ec0272, .name = "ALC272", .patch = patch_alc662 },
 	{ .id = 0x10ec0275, .name = "ALC275", .patch = patch_alc269 },
 	{ .id = 0x10ec0276, .name = "ALC276", .patch = patch_alc269 },
+	{ .id = 0x10ec0280, .name = "ALC280", .patch = patch_alc269 },
 	{ .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",
 	  .patch = patch_alc861 },
 	{ .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },

sound/pci/hda/patch_sigmatel.c+6−1

 					 AC_PINCTL_IN_EN);
 	for (i = 0; i < spec->num_pwrs; i++)  {
 		hda_nid_t nid = spec->pwr_nids[i];
-		int pinctl, def_conf;
+		unsigned int pinctl, def_conf;
 		def_conf = snd_hda_codec_get_pincfg(codec, nid);
 		def_conf = get_defcfg_connect(def_conf);
 			stac_toggle_power_map(codec, nid, 0);
 			continue;
 		}
+		if (def_conf == AC_JACK_PORT_FIXED) {
+			/* no need for jack detection for fixed pins */
+			stac_toggle_power_map(codec, nid, 1);
+			continue;
+		}
 		/* power on when no jack detection is available */
 		/* or when the VREF is used for controlling LED */
 		if (!spec->hp_detect ||

sound/soc/codecs/wm8994.c+0−3

@@ -724,9 +724,6 @@ static void wm1811_jackdet_set_mode(struct snd_soc_codec *codec, u16 mode) · 723 unmodified lines
724	{	724	{
725	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);	725	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
726		726
727	if (!wm8994->jackdet \|\| !wm8994->jack_cb)
728	return;
729
730	if (!wm8994->jackdet \|\| !wm8994->jack_cb)	727	if (!wm8994->jackdet \|\| !wm8994->jack_cb)
731	return;	728	return;
732		729

sound/usb/mixer_maps.c+8−0

@@ -341,6 +341,14 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { · 340 unmodified lines
341	.map = audigy2nx_map,	341	.map = audigy2nx_map,
342	.selector_map = audigy2nx_selectors,	342	.selector_map = audigy2nx_selectors,
343	},	343	},
		344	{ /* Logitech, Inc. QuickCam Pro for Notebooks */
		345	.id = USB_ID(0x046d, 0x0991),
		346	.ignore_ctl_error = 1,
		347	},
		348	{ /* Logitech, Inc. QuickCam E 3500 */
		349	.id = USB_ID(0x046d, 0x09a4),
		350	.ignore_ctl_error = 1,
		351	},
344	{	352	{
345	/* Hercules DJ Console (Windows Edition) */	353	/* Hercules DJ Console (Windows Edition) */
346	.id = USB_ID(0x06f8, 0xb000),	354	.id = USB_ID(0x06f8, 0xb000),

sound/usb/quirks-table.h+30−0

@@ -1831,6 +1831,36 @@ YAMAHA_DEVICE(0x7010, "UB99"), · 1830 unmodified lines
1831	}	1831	}
1832	}	1832	}
1833	},	1833	},
		1834	{
		1835	USB_DEVICE(0x0582, 0x014d),
		1836	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
		1837	/* .vendor_name = "BOSS", */
		1838	/* .product_name = "GT-100", */
		1839	.ifnum = QUIRK_ANY_INTERFACE,
		1840	.type = QUIRK_COMPOSITE,
		1841	.data = (const struct snd_usb_audio_quirk[]) {
		1842	{
		1843	.ifnum = 1,
		1844	.type = QUIRK_AUDIO_STANDARD_INTERFACE
		1845	},
		1846	{
		1847	.ifnum = 2,
		1848	.type = QUIRK_AUDIO_STANDARD_INTERFACE
		1849	},
		1850	{
		1851	.ifnum = 3,
		1852	.type = QUIRK_MIDI_FIXED_ENDPOINT,
		1853	.data = & (const struct snd_usb_midi_endpoint_info) {
		1854	.out_cables = 0x0001,
		1855	.in_cables = 0x0001
		1856	}
		1857	},
		1858	{
		1859	.ifnum = -1
		1860	}
		1861	}
		1862	}
		1863	},
1834		1864
1835	/* Guillemot devices */	1865	/* Guillemot devices */
1836	{	1866	{

@@ -71,7 +71,7 @@ static void __init clk_misc_init(void) · 70 unmodified lines
71	__mxs_setl(30 << BP_FRAC_IOFRAC, FRAC);	71	__mxs_setl(30 << BP_FRAC_IOFRAC, FRAC);
72	}	72	}
73		73
74	static struct clk_lookup uart_lookups[] __initdata = {	74	static struct clk_lookup uart_lookups[] = {
75	{ .dev_id = "duart", },	75	{ .dev_id = "duart", },
76	{ .dev_id = "mxs-auart.0", },	76	{ .dev_id = "mxs-auart.0", },
77	{ .dev_id = "mxs-auart.1", },	77	{ .dev_id = "mxs-auart.1", },
@@ -80,31 +80,31 @@ static struct clk_lookup uart_lookups[] __initdata = { · 2 unmodified lines
80	{ .dev_id = "80070000.serial", },	80	{ .dev_id = "80070000.serial", },
81	};	81	};
82		82
83	static struct clk_lookup hbus_lookups[] __initdata = {	83	static struct clk_lookup hbus_lookups[] = {
84	{ .dev_id = "imx23-dma-apbh", },	84	{ .dev_id = "imx23-dma-apbh", },
85	{ .dev_id = "80004000.dma-apbh", },	85	{ .dev_id = "80004000.dma-apbh", },
86	};	86	};
87		87
88	static struct clk_lookup xbus_lookups[] __initdata = {	88	static struct clk_lookup xbus_lookups[] = {
89	{ .dev_id = "duart", .con_id = "apb_pclk"},	89	{ .dev_id = "duart", .con_id = "apb_pclk"},
90	{ .dev_id = "80070000.serial", .con_id = "apb_pclk"},	90	{ .dev_id = "80070000.serial", .con_id = "apb_pclk"},
91	{ .dev_id = "imx23-dma-apbx", },	91	{ .dev_id = "imx23-dma-apbx", },
92	{ .dev_id = "80024000.dma-apbx", },	92	{ .dev_id = "80024000.dma-apbx", },
93	};	93	};
94		94
95	static struct clk_lookup ssp_lookups[] __initdata = {	95	static struct clk_lookup ssp_lookups[] = {
96	{ .dev_id = "imx23-mmc.0", },	96	{ .dev_id = "imx23-mmc.0", },
97	{ .dev_id = "imx23-mmc.1", },	97	{ .dev_id = "imx23-mmc.1", },
98	{ .dev_id = "80010000.ssp", },	98	{ .dev_id = "80010000.ssp", },
99	{ .dev_id = "80034000.ssp", },	99	{ .dev_id = "80034000.ssp", },
100	};	100	};
101		101
102	static struct clk_lookup lcdif_lookups[] __initdata = {	102	static struct clk_lookup lcdif_lookups[] = {
103	{ .dev_id = "imx23-fb", },	103	{ .dev_id = "imx23-fb", },
104	{ .dev_id = "80030000.lcdif", },	104	{ .dev_id = "80030000.lcdif", },
105	};	105	};
106		106
107	static struct clk_lookup gpmi_lookups[] __initdata = {	107	static struct clk_lookup gpmi_lookups[] = {
108	{ .dev_id = "imx23-gpmi-nand", },	108	{ .dev_id = "imx23-gpmi-nand", },
109	{ .dev_id = "8000c000.gpmi", },	109	{ .dev_id = "8000c000.gpmi", },
110	};	110	};

@@ -120,7 +120,7 @@ static void __init clk_misc_init(void) · 119 unmodified lines
120	writel_relaxed(val, FRAC0);	120	writel_relaxed(val, FRAC0);
121	}	121	}
122		122
123	static struct clk_lookup uart_lookups[] __initdata = {	123	static struct clk_lookup uart_lookups[] = {
124	{ .dev_id = "duart", },	124	{ .dev_id = "duart", },
125	{ .dev_id = "mxs-auart.0", },	125	{ .dev_id = "mxs-auart.0", },
126	{ .dev_id = "mxs-auart.1", },	126	{ .dev_id = "mxs-auart.1", },
@@ -135,71 +135,71 @@ static struct clk_lookup uart_lookups[] __initdata = { · 8 unmodified lines
135	{ .dev_id = "80074000.serial", },	135	{ .dev_id = "80074000.serial", },
136	};	136	};
137		137
138	static struct clk_lookup hbus_lookups[] __initdata = {	138	static struct clk_lookup hbus_lookups[] = {
139	{ .dev_id = "imx28-dma-apbh", },	139	{ .dev_id = "imx28-dma-apbh", },
140	{ .dev_id = "80004000.dma-apbh", },	140	{ .dev_id = "80004000.dma-apbh", },
141	};	141	};
142		142
143	static struct clk_lookup xbus_lookups[] __initdata = {	143	static struct clk_lookup xbus_lookups[] = {
144	{ .dev_id = "duart", .con_id = "apb_pclk"},	144	{ .dev_id = "duart", .con_id = "apb_pclk"},
145	{ .dev_id = "80074000.serial", .con_id = "apb_pclk"},	145	{ .dev_id = "80074000.serial", .con_id = "apb_pclk"},
146	{ .dev_id = "imx28-dma-apbx", },	146	{ .dev_id = "imx28-dma-apbx", },
147	{ .dev_id = "80024000.dma-apbx", },	147	{ .dev_id = "80024000.dma-apbx", },
148	};	148	};
149		149
150	static struct clk_lookup ssp0_lookups[] __initdata = {	150	static struct clk_lookup ssp0_lookups[] = {
151	{ .dev_id = "imx28-mmc.0", },	151	{ .dev_id = "imx28-mmc.0", },
152	{ .dev_id = "80010000.ssp", },	152	{ .dev_id = "80010000.ssp", },
153	};	153	};
154		154
155	static struct clk_lookup ssp1_lookups[] __initdata = {	155	static struct clk_lookup ssp1_lookups[] = {
156	{ .dev_id = "imx28-mmc.1", },	156	{ .dev_id = "imx28-mmc.1", },
157	{ .dev_id = "80012000.ssp", },	157	{ .dev_id = "80012000.ssp", },
158	};	158	};
159		159
160	static struct clk_lookup ssp2_lookups[] __initdata = {	160	static struct clk_lookup ssp2_lookups[] = {
161	{ .dev_id = "imx28-mmc.2", },	161	{ .dev_id = "imx28-mmc.2", },
162	{ .dev_id = "80014000.ssp", },	162	{ .dev_id = "80014000.ssp", },
163	};	163	};
164		164
165	static struct clk_lookup ssp3_lookups[] __initdata = {	165	static struct clk_lookup ssp3_lookups[] = {
166	{ .dev_id = "imx28-mmc.3", },	166	{ .dev_id = "imx28-mmc.3", },
167	{ .dev_id = "80016000.ssp", },	167	{ .dev_id = "80016000.ssp", },
168	};	168	};
169		169
170	static struct clk_lookup lcdif_lookups[] __initdata = {	170	static struct clk_lookup lcdif_lookups[] = {
171	{ .dev_id = "imx28-fb", },	171	{ .dev_id = "imx28-fb", },
172	{ .dev_id = "80030000.lcdif", },	172	{ .dev_id = "80030000.lcdif", },
173	};	173	};
174		174
175	static struct clk_lookup gpmi_lookups[] __initdata = {	175	static struct clk_lookup gpmi_lookups[] = {
176	{ .dev_id = "imx28-gpmi-nand", },	176	{ .dev_id = "imx28-gpmi-nand", },
177	{ .dev_id = "8000c000.gpmi", },	177	{ .dev_id = "8000c000.gpmi", },
178	};	178	};
179		179
180	static struct clk_lookup fec_lookups[] __initdata = {	180	static struct clk_lookup fec_lookups[] = {
181	{ .dev_id = "imx28-fec.0", },	181	{ .dev_id = "imx28-fec.0", },
182	{ .dev_id = "imx28-fec.1", },	182	{ .dev_id = "imx28-fec.1", },
183	{ .dev_id = "800f0000.ethernet", },	183	{ .dev_id = "800f0000.ethernet", },
184	{ .dev_id = "800f4000.ethernet", },	184	{ .dev_id = "800f4000.ethernet", },
185	};	185	};
186		186
187	static struct clk_lookup can0_lookups[] __initdata = {	187	static struct clk_lookup can0_lookups[] = {
188	{ .dev_id = "flexcan.0", },	188	{ .dev_id = "flexcan.0", },
189	{ .dev_id = "80032000.can", },	189	{ .dev_id = "80032000.can", },
190	};	190	};
191		191
192	static struct clk_lookup can1_lookups[] __initdata = {	192	static struct clk_lookup can1_lookups[] = {
193	{ .dev_id = "flexcan.1", },	193	{ .dev_id = "flexcan.1", },
194	{ .dev_id = "80034000.can", },	194	{ .dev_id = "80034000.can", },
195	};	195	};
196		196
197	static struct clk_lookup saif0_lookups[] __initdata = {	197	static struct clk_lookup saif0_lookups[] = {
198	{ .dev_id = "mxs-saif.0", },	198	{ .dev_id = "mxs-saif.0", },
199	{ .dev_id = "80042000.saif", },	199	{ .dev_id = "80042000.saif", },
200	};	200	};
201		201
202	static struct clk_lookup saif1_lookups[] __initdata = {	202	static struct clk_lookup saif1_lookups[] = {
203	{ .dev_id = "mxs-saif.1", },	203	{ .dev_id = "mxs-saif.1", },
204	{ .dev_id = "80046000.saif", },	204	{ .dev_id = "80046000.saif", },
205	};	205	};
@@ -245,8 +245,8 @@ int __init mx28_clocks_init(void) · 39 unmodified lines
245	clks[pll2] = mxs_clk_pll("pll2", "ref_xtal", PLL2CTRL0, 23, 50000000);	245	clks[pll2] = mxs_clk_pll("pll2", "ref_xtal", PLL2CTRL0, 23, 50000000);
246	clks[ref_cpu] = mxs_clk_ref("ref_cpu", "pll0", FRAC0, 0);	246	clks[ref_cpu] = mxs_clk_ref("ref_cpu", "pll0", FRAC0, 0);
247	clks[ref_emi] = mxs_clk_ref("ref_emi", "pll0", FRAC0, 1);	247	clks[ref_emi] = mxs_clk_ref("ref_emi", "pll0", FRAC0, 1);
248	clks[ref_io0] = mxs_clk_ref("ref_io0", "pll0", FRAC0, 2);	248	clks[ref_io1] = mxs_clk_ref("ref_io1", "pll0", FRAC0, 2);
249	clks[ref_io1] = mxs_clk_ref("ref_io1", "pll0", FRAC0, 3);	249	clks[ref_io0] = mxs_clk_ref("ref_io0", "pll0", FRAC0, 3);
250	clks[ref_pix] = mxs_clk_ref("ref_pix", "pll0", FRAC1, 0);	250	clks[ref_pix] = mxs_clk_ref("ref_pix", "pll0", FRAC1, 0);
251	clks[ref_hsadc] = mxs_clk_ref("ref_hsadc", "pll0", FRAC1, 1);	251	clks[ref_hsadc] = mxs_clk_ref("ref_hsadc", "pll0", FRAC1, 1);
252	clks[ref_gpmi] = mxs_clk_ref("ref_gpmi", "pll0", FRAC1, 2);	252	clks[ref_gpmi] = mxs_clk_ref("ref_gpmi", "pll0", FRAC1, 2);