[gentoo-commits] proj/hardened-patchset:master commit in: 2.6.32/, 3.1.3/

[Anthony G. Basile]

commit:     d5ac8150531b708b49e4c710a7d6e7f55e286bb4
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 14:52:11 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 14:52:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=d5ac8150

Removed patches available in genpatches

---
 2.6.32/0000_README                |    4 -
 2.6.32/1048_linux-2.6.32.49.patch | 2143 -------------------------------------
 3.1.3/0000_README                 |    4 -
 3.1.3/1002_linux-3.1.3.patch      | 1953 ---------------------------------
 4 files changed, 0 insertions(+), 4104 deletions(-)

diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index ad9e318..11a0ad4 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -3,10 +3,6 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	1048_linux-2.6.32.44.patch
-From:	http://www.kernel.org
-Desc:	Linux 2.6.39.49
-
 Patch:	4420_grsecurity-2.2.2-2.6.32.49-201111262001.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity

diff --git a/2.6.32/1048_linux-2.6.32.49.patch b/2.6.32/1048_linux-2.6.32.49.patch
deleted file mode 100644
index 82f5850..0000000
--- a/2.6.32/1048_linux-2.6.32.49.patch
+++ /dev/null
@@ -1,2143 +0,0 @@
-diff --git a/Documentation/Makefile b/Documentation/Makefile
-index 94b9457..043d7da 100644
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -1,3 +1,3 @@
- obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
- 	filesystems/configfs/ ia64/ networking/ \
--	pcmcia/ spi/ video4linux/ vm/ watchdog/src/
-+	pcmcia/ spi/ vm/ watchdog/src/
-diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
-index 71c602d..ab8689b 100644
---- a/Documentation/kbuild/makefiles.txt
-+++ b/Documentation/kbuild/makefiles.txt
-@@ -502,6 +502,18 @@ more details, with real examples.
- 	gcc >= 3.00. For gcc < 3.00, -malign-functions=4 is used.
- 	Note: cc-option-align uses KBUILD_CFLAGS for $(CC) options
- 
-+    cc-disable-warning
-+	cc-disable-warning checks if gcc supports a given warning and returns
-+	the commandline switch to disable it. This special function is needed,
-+	because gcc 4.4 and later accept any unknown -Wno-* option and only
-+	warn about it if there is another warning in the source file.
-+
-+	Example:
-+		KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
-+
-+	In the above example, -Wno-unused-but-set-variable will be added to
-+	KBUILD_CFLAGS only if gcc really accepts it.
-+
-     cc-version
- 	cc-version returns a numerical version of the $(CC) compiler version.
- 	The format is <major><minor> where both are two digits. So for example
-diff --git a/Documentation/video4linux/Makefile b/Documentation/video4linux/Makefile
-deleted file mode 100644
-index 1ed0e98..0000000
---- a/Documentation/video4linux/Makefile
-+++ /dev/null
-@@ -1,8 +0,0 @@
--# kbuild trick to avoid linker error. Can be omitted if a module is built.
--obj- := dummy.o
--
--# List of programs to build
--hostprogs-y := v4lgrab
--
--# Tell kbuild to always build the programs
--always := $(hostprogs-y)
-diff --git a/Documentation/video4linux/v4lgrab.c b/Documentation/video4linux/v4lgrab.c
-deleted file mode 100644
-index c8ded17..0000000
---- a/Documentation/video4linux/v4lgrab.c
-+++ /dev/null
-@@ -1,201 +0,0 @@
--/* Simple Video4Linux image grabber. */
--/*
-- *	Video4Linux Driver Test/Example Framegrabbing Program
-- *
-- *	Compile with:
-- *		gcc -s -Wall -Wstrict-prototypes v4lgrab.c -o v4lgrab
-- *	Use as:
-- *		v4lgrab >image.ppm
-- *
-- *	Copyright (C) 1998-05-03, Phil Blundell <philb@×××.org>
-- *	Copied from http://www.tazenda.demon.co.uk/phil/vgrabber.c
-- *	with minor modifications (Dave Forrest, drf5n@××××××××.edu).
-- *
-- *
-- *	For some cameras you may need to pre-load libv4l to perform
-- *	the necessary decompression, e.g.:
-- *
-- *	export LD_PRELOAD=/usr/lib/libv4l/v4l1compat.so
-- *	./v4lgrab >image.ppm
-- *
-- *	see http://hansdegoede.livejournal.com/3636.html for details.
-- *
-- */
--
--#include <unistd.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <fcntl.h>
--#include <stdio.h>
--#include <sys/ioctl.h>
--#include <stdlib.h>
--
--#include <linux/types.h>
--#include <linux/videodev.h>
--
--#define VIDEO_DEV "/dev/video0"
--
--/* Stole this from tvset.c */
--
--#define READ_VIDEO_PIXEL(buf, format, depth, r, g, b)                   \
--{                                                                       \
--	switch (format)                                                 \
--	{                                                               \
--		case VIDEO_PALETTE_GREY:                                \
--			switch (depth)                                  \
--			{                                               \
--				case 4:                                 \
--				case 6:                                 \
--				case 8:                                 \
--					(r) = (g) = (b) = (*buf++ << 8);\
--					break;                          \
--									\
--				case 16:                                \
--					(r) = (g) = (b) =               \
--						*((unsigned short *) buf);      \
--					buf += 2;                       \
--					break;                          \
--			}                                               \
--			break;                                          \
--									\
--									\
--		case VIDEO_PALETTE_RGB565:                              \
--		{                                                       \
--			unsigned short tmp = *(unsigned short *)buf;    \
--			(r) = tmp&0xF800;                               \
--			(g) = (tmp<<5)&0xFC00;                          \
--			(b) = (tmp<<11)&0xF800;                         \
--			buf += 2;                                       \
--		}                                                       \
--		break;                                                  \
--									\
--		case VIDEO_PALETTE_RGB555:                              \
--			(r) = (buf[0]&0xF8)<<8;                         \
--			(g) = ((buf[0] << 5 | buf[1] >> 3)&0xF8)<<8;    \
--			(b) = ((buf[1] << 2 ) & 0xF8)<<8;               \
--			buf += 2;                                       \
--			break;                                          \
--									\
--		case VIDEO_PALETTE_RGB24:                               \
--			(r) = buf[0] << 8; (g) = buf[1] << 8;           \
--			(b) = buf[2] << 8;                              \
--			buf += 3;                                       \
--			break;                                          \
--									\
--		default:                                                \
--			fprintf(stderr,                                 \
--				"Format %d not yet supported\n",        \
--				format);                                \
--	}                                                               \
--}
--
--static int get_brightness_adj(unsigned char *image, long size, int *brightness) {
--  long i, tot = 0;
--  for (i=0;i<size*3;i++)
--    tot += image[i];
--  *brightness = (128 - tot/(size*3))/3;
--  return !((tot/(size*3)) >= 126 && (tot/(size*3)) <= 130);
--}
--
--int main(int argc, char ** argv)
--{
--  int fd = open(VIDEO_DEV, O_RDONLY), f;
--  struct video_capability cap;
--  struct video_window win;
--  struct video_picture vpic;
--
--  unsigned char *buffer, *src;
--  int bpp = 24, r = 0, g = 0, b = 0;
--  unsigned int i, src_depth = 16;
--
--  if (fd < 0) {
--    perror(VIDEO_DEV);
--    exit(1);
--  }
--
--  if (ioctl(fd, VIDIOCGCAP, &cap) < 0) {
--    perror("VIDIOGCAP");
--    fprintf(stderr, "(" VIDEO_DEV " not a video4linux device?)\n");
--    close(fd);
--    exit(1);
--  }
--
--  if (ioctl(fd, VIDIOCGWIN, &win) < 0) {
--    perror("VIDIOCGWIN");
--    close(fd);
--    exit(1);
--  }
--
--  if (ioctl(fd, VIDIOCGPICT, &vpic) < 0) {
--    perror("VIDIOCGPICT");
--    close(fd);
--    exit(1);
--  }
--
--  if (cap.type & VID_TYPE_MONOCHROME) {
--    vpic.depth=8;
--    vpic.palette=VIDEO_PALETTE_GREY;    /* 8bit grey */
--    if(ioctl(fd, VIDIOCSPICT, &vpic) < 0) {
--      vpic.depth=6;
--      if(ioctl(fd, VIDIOCSPICT, &vpic) < 0) {
--	vpic.depth=4;
--	if(ioctl(fd, VIDIOCSPICT, &vpic) < 0) {
--	  fprintf(stderr, "Unable to find a supported capture format.\n");
--	  close(fd);
--	  exit(1);
--	}
--      }
--    }
--  } else {
--    vpic.depth=24;
--    vpic.palette=VIDEO_PALETTE_RGB24;
--
--    if(ioctl(fd, VIDIOCSPICT, &vpic) < 0) {
--      vpic.palette=VIDEO_PALETTE_RGB565;
--      vpic.depth=16;
--
--      if(ioctl(fd, VIDIOCSPICT, &vpic)==-1) {
--	vpic.palette=VIDEO_PALETTE_RGB555;
--	vpic.depth=15;
--
--	if(ioctl(fd, VIDIOCSPICT, &vpic)==-1) {
--	  fprintf(stderr, "Unable to find a supported capture format.\n");
--	  return -1;
--	}
--      }
--    }
--  }
--
--  buffer = malloc(win.width * win.height * bpp);
--  if (!buffer) {
--    fprintf(stderr, "Out of memory.\n");
--    exit(1);
--  }
--
--  do {
--    int newbright;
--    read(fd, buffer, win.width * win.height * bpp);
--    f = get_brightness_adj(buffer, win.width * win.height, &newbright);
--    if (f) {
--      vpic.brightness += (newbright << 8);
--      if(ioctl(fd, VIDIOCSPICT, &vpic)==-1) {
--	perror("VIDIOSPICT");
--	break;
--      }
--    }
--  } while (f);
--
--  fprintf(stdout, "P6\n%d %d 255\n", win.width, win.height);
--
--  src = buffer;
--
--  for (i = 0; i < win.width * win.height; i++) {
--    READ_VIDEO_PIXEL(src, vpic.palette, src_depth, r, g, b);
--    fputc(r>>8, stdout);
--    fputc(g>>8, stdout);
--    fputc(b>>8, stdout);
--  }
--
--  close(fd);
--  return 0;
--}
-diff --git a/Makefile b/Makefile
-index 400a175..a19b0e8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -537,6 +537,9 @@ ifndef CONFIG_CC_STACKPROTECTOR
- KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
- endif
- 
-+# This warning generated too much noise in a regular build.
-+KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
-+
- ifdef CONFIG_FRAME_POINTER
- KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls
- else
-@@ -565,7 +568,7 @@ CHECKFLAGS     += $(NOSTDINC_FLAGS)
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
- # disable pointer signed / unsigned warnings in gcc 4.0
--KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)
-+KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
- 
- # disable invalid "can't wrap" optimizations for signed / pointers
- KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)
-diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
-index 2bef526..204f650 100644
---- a/arch/ia64/hp/sim/simserial.c
-+++ b/arch/ia64/hp/sim/simserial.c
-@@ -395,7 +395,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
- {
- 	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
- 	    (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
--	    (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-+	    (cmd != TIOCMIWAIT)) {
- 		if (tty->flags & (1 << TTY_IO_ERROR))
- 		    return -EIO;
- 	}
-@@ -433,16 +433,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
- 		case TIOCMIWAIT:
- 			printk(KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n");
- 			return 0;
--		/*
--		 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
--		 * Return: write counters to the user passed counter struct
--		 * NB: both 1->0 and 0->1 transitions are counted except for
--		 *     RI where only 0->1 is counted.
--		 */
--		case TIOCGICOUNT:
--			printk(KERN_INFO "rs_ioctl: TIOCGICOUNT called\n");
--			return 0;
--
- 		case TIOCSERGWILD:
- 		case TIOCSERSWILD:
- 			/* "setserial -W" is called in Debian boot */
-diff --git a/drivers/base/sys.c b/drivers/base/sys.c
-index 0d90390..3f202f7 100644
---- a/drivers/base/sys.c
-+++ b/drivers/base/sys.c
-@@ -471,6 +471,12 @@ int sysdev_resume(void)
- {
- 	struct sysdev_class *cls;
- 
-+	/*
-+	 * Called from syscore in mainline but called directly here
-+	 * since syscore does not exist in this tree.
-+	 */
-+	irq_pm_syscore_resume();
-+
- 	WARN_ONCE(!irqs_disabled(),
- 		"Interrupts enabled while resuming system devices\n");
- 
-diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
-index 6c32fbf..579d479 100644
---- a/drivers/char/amiserial.c
-+++ b/drivers/char/amiserial.c
-@@ -1262,6 +1262,36 @@ static int rs_break(struct tty_struct *tty, int break_state)
- 	return 0;
- }
- 
-+/*
-+ * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-+ * Return: write counters to the user passed counter struct
-+ * NB: both 1->0 and 0->1 transitions are counted except for
-+ *     RI where only 0->1 is counted.
-+ */
-+static int rs_get_icount(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount)
-+{
-+	struct async_struct *info = tty->driver_data;
-+	struct async_icount cnow;
-+	unsigned long flags;
-+
-+	local_irq_save(flags);
-+	cnow = info->state->icount;
-+	local_irq_restore(flags);
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+	icount->rx = cnow.rx;
-+	icount->tx = cnow.tx;
-+	icount->frame = cnow.frame;
-+	icount->overrun = cnow.overrun;
-+	icount->parity = cnow.parity;
-+	icount->brk = cnow.brk;
-+	icount->buf_overrun = cnow.buf_overrun;
-+
-+	return 0;
-+}
- 
- static int rs_ioctl(struct tty_struct *tty, struct file * file,
- 		    unsigned int cmd, unsigned long arg)
-@@ -1331,31 +1361,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
- 			}
- 			/* NOTREACHED */
- 
--		/* 
--		 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
--		 * Return: write counters to the user passed counter struct
--		 * NB: both 1->0 and 0->1 transitions are counted except for
--		 *     RI where only 0->1 is counted.
--		 */
--		case TIOCGICOUNT:
--			local_irq_save(flags);
--			cnow = info->state->icount;
--			local_irq_restore(flags);
--			icount.cts = cnow.cts;
--			icount.dsr = cnow.dsr;
--			icount.rng = cnow.rng;
--			icount.dcd = cnow.dcd;
--			icount.rx = cnow.rx;
--			icount.tx = cnow.tx;
--			icount.frame = cnow.frame;
--			icount.overrun = cnow.overrun;
--			icount.parity = cnow.parity;
--			icount.brk = cnow.brk;
--			icount.buf_overrun = cnow.buf_overrun;
--
--			if (copy_to_user(argp, &icount, sizeof(icount)))
--				return -EFAULT;
--			return 0;
- 		case TIOCSERGWILD:
- 		case TIOCSERSWILD:
- 			/* "setserial -W" is called in Debian boot */
-@@ -1948,6 +1953,7 @@ static const struct tty_operations serial_ops = {
- 	.wait_until_sent = rs_wait_until_sent,
- 	.tiocmget = rs_tiocmget,
- 	.tiocmset = rs_tiocmset,
-+	.get_icount = rs_get_icount,
- 	.proc_fops = &rs_proc_fops,
- };
- 
-diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
-index 4254457..a0369dc 100644
---- a/drivers/char/cyclades.c
-+++ b/drivers/char/cyclades.c
-@@ -2798,29 +2798,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
- 		 * NB: both 1->0 and 0->1 transitions are counted except for
- 		 *     RI where only 0->1 is counted.
- 		 */
--	case TIOCGICOUNT: {
--		struct serial_icounter_struct sic = { };
--
--		spin_lock_irqsave(&info->card->card_lock, flags);
--		cnow = info->icount;
--		spin_unlock_irqrestore(&info->card->card_lock, flags);
--
--		sic.cts = cnow.cts;
--		sic.dsr = cnow.dsr;
--		sic.rng = cnow.rng;
--		sic.dcd = cnow.dcd;
--		sic.rx = cnow.rx;
--		sic.tx = cnow.tx;
--		sic.frame = cnow.frame;
--		sic.overrun = cnow.overrun;
--		sic.parity = cnow.parity;
--		sic.brk = cnow.brk;
--		sic.buf_overrun = cnow.buf_overrun;
--
--		if (copy_to_user(argp, &sic, sizeof(sic)))
--			ret_val = -EFAULT;
--		break;
--	}
- 	default:
- 		ret_val = -ENOIOCTLCMD;
- 	}
-@@ -2832,6 +2809,31 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
- 	return ret_val;
- }				/* cy_ioctl */
- 
-+static int cy_get_icount(struct tty_struct *tty,
-+				struct serial_icounter_struct *sic)
-+{
-+	struct cyclades_port *info = tty->driver_data;
-+	struct cyclades_icount cnow;	/* Used to snapshot */
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&info->card->card_lock, flags);
-+	cnow = info->icount;
-+	spin_unlock_irqrestore(&info->card->card_lock, flags);
-+
-+	sic->cts = cnow.cts;
-+	sic->dsr = cnow.dsr;
-+	sic->rng = cnow.rng;
-+	sic->dcd = cnow.dcd;
-+	sic->rx = cnow.rx;
-+	sic->tx = cnow.tx;
-+	sic->frame = cnow.frame;
-+	sic->overrun = cnow.overrun;
-+	sic->parity = cnow.parity;
-+	sic->brk = cnow.brk;
-+	sic->buf_overrun = cnow.buf_overrun;
-+	return 0;
-+}
-+
- /*
-  * This routine allows the tty driver to be notified when
-  * device's termios settings have changed.  Note that a
-@@ -4098,6 +4100,7 @@ static const struct tty_operations cy_ops = {
- 	.wait_until_sent = cy_wait_until_sent,
- 	.tiocmget = cy_tiocmget,
- 	.tiocmset = cy_tiocmset,
-+	.get_icount = cy_get_icount,
- 	.proc_fops = &cyclades_proc_fops,
- };
- 
-diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
-index 517271c..3bec541 100644
---- a/drivers/char/ip2/ip2main.c
-+++ b/drivers/char/ip2/ip2main.c
-@@ -183,6 +183,8 @@ static void ip2_hangup(PTTY);
- static int  ip2_tiocmget(struct tty_struct *tty, struct file *file);
- static int  ip2_tiocmset(struct tty_struct *tty, struct file *file,
- 			 unsigned int set, unsigned int clear);
-+static int ip2_get_icount(struct tty_struct *tty,
-+		struct serial_icounter_struct *icount);
- 
- static void set_irq(int, int);
- static void ip2_interrupt_bh(struct work_struct *work);
-@@ -448,6 +450,7 @@ static const struct tty_operations ip2_ops = {
- 	.hangup          = ip2_hangup,
- 	.tiocmget	 = ip2_tiocmget,
- 	.tiocmset	 = ip2_tiocmset,
-+	.get_icount	 = ip2_get_icount,
- 	.proc_fops	 = &ip2_proc_fops,
- };
- 
-@@ -2112,7 +2115,6 @@ ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )
- 	i2ChanStrPtr pCh = DevTable[tty->index];
- 	i2eBordStrPtr pB;
- 	struct async_icount cprev, cnow;	/* kernel counter temps */
--	struct serial_icounter_struct __user *p_cuser;
- 	int rc = 0;
- 	unsigned long flags;
- 	void __user *argp = (void __user *)arg;
-@@ -2281,34 +2283,6 @@ ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )
- 		break;
- 
- 	/*
--	 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
--	 * Return: write counters to the user passed counter struct
--	 * NB: both 1->0 and 0->1 transitions are counted except for RI where
--	 * only 0->1 is counted. The controller is quite capable of counting
--	 * both, but this done to preserve compatibility with the standard
--	 * serial driver.
--	 */
--	case TIOCGICOUNT:
--		ip2trace (CHANN, ITRC_IOCTL, 11, 1, rc );
--
--		write_lock_irqsave(&pB->read_fifo_spinlock, flags);
--		cnow = pCh->icount;
--		write_unlock_irqrestore(&pB->read_fifo_spinlock, flags);
--		p_cuser = argp;
--		rc = put_user(cnow.cts, &p_cuser->cts);
--		rc = put_user(cnow.dsr, &p_cuser->dsr);
--		rc = put_user(cnow.rng, &p_cuser->rng);
--		rc = put_user(cnow.dcd, &p_cuser->dcd);
--		rc = put_user(cnow.rx, &p_cuser->rx);
--		rc = put_user(cnow.tx, &p_cuser->tx);
--		rc = put_user(cnow.frame, &p_cuser->frame);
--		rc = put_user(cnow.overrun, &p_cuser->overrun);
--		rc = put_user(cnow.parity, &p_cuser->parity);
--		rc = put_user(cnow.brk, &p_cuser->brk);
--		rc = put_user(cnow.buf_overrun, &p_cuser->buf_overrun);
--		break;
--
--	/*
- 	 * The rest are not supported by this driver. By returning -ENOIOCTLCMD they
- 	 * will be passed to the line discipline for it to handle.
- 	 */
-@@ -2332,6 +2306,46 @@ ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )
- 	return rc;
- }
- 
-+static int ip2_get_icount(struct tty_struct *tty,
-+		struct serial_icounter_struct *icount)
-+{
-+	i2ChanStrPtr pCh = DevTable[tty->index];
-+	i2eBordStrPtr pB;
-+	struct async_icount cnow;	/* kernel counter temp */
-+	unsigned long flags;
-+
-+	if ( pCh == NULL )
-+		return -ENODEV;
-+
-+	pB = pCh->pMyBord;
-+
-+	/*
-+	 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-+	 * Return: write counters to the user passed counter struct
-+	 * NB: both 1->0 and 0->1 transitions are counted except for RI where
-+	 * only 0->1 is counted. The controller is quite capable of counting
-+	 * both, but this done to preserve compatibility with the standard
-+	 * serial driver.
-+	 */
-+
-+	write_lock_irqsave(&pB->read_fifo_spinlock, flags);
-+	cnow = pCh->icount;
-+	write_unlock_irqrestore(&pB->read_fifo_spinlock, flags);
-+
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+	icount->rx = cnow.rx;
-+	icount->tx = cnow.tx;
-+	icount->frame = cnow.frame;
-+	icount->overrun = cnow.overrun;
-+	icount->parity = cnow.parity;
-+	icount->brk = cnow.brk;
-+	icount->buf_overrun = cnow.buf_overrun;
-+	return 0;
-+}
-+
- /******************************************************************************/
- /* Function:   GetSerialInfo()                                                */
- /* Parameters: Pointer to channel structure                                   */
-diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
-index 5e28d39..4b97406 100644
---- a/drivers/char/mxser.c
-+++ b/drivers/char/mxser.c
-@@ -1736,7 +1736,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
- 		return 0;
- 	}
- 
--	if (cmd != TIOCGSERIAL && cmd != TIOCMIWAIT && cmd != TIOCGICOUNT &&
-+	if (cmd != TIOCGSERIAL && cmd != TIOCMIWAIT &&
- 			test_bit(TTY_IO_ERROR, &tty->flags))
- 		return -EIO;
- 
-@@ -1766,32 +1766,6 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
- 
- 		return wait_event_interruptible(info->port.delta_msr_wait,
- 				mxser_cflags_changed(info, arg, &cnow));
--	/*
--	 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
--	 * Return: write counters to the user passed counter struct
--	 * NB: both 1->0 and 0->1 transitions are counted except for
--	 *     RI where only 0->1 is counted.
--	 */
--	case TIOCGICOUNT: {
--		struct serial_icounter_struct icnt = { 0 };
--		spin_lock_irqsave(&info->slock, flags);
--		cnow = info->icount;
--		spin_unlock_irqrestore(&info->slock, flags);
--
--		icnt.frame = cnow.frame;
--		icnt.brk = cnow.brk;
--		icnt.overrun = cnow.overrun;
--		icnt.buf_overrun = cnow.buf_overrun;
--		icnt.parity = cnow.parity;
--		icnt.rx = cnow.rx;
--		icnt.tx = cnow.tx;
--		icnt.cts = cnow.cts;
--		icnt.dsr = cnow.dsr;
--		icnt.rng = cnow.rng;
--		icnt.dcd = cnow.dcd;
--
--		return copy_to_user(argp, &icnt, sizeof(icnt)) ? -EFAULT : 0;
--	}
- 	case MOXA_HighSpeedOn:
- 		return put_user(info->baud_base != 115200 ? 1 : 0, (int __user *)argp);
- 	case MOXA_SDS_RSTICOUNTER:
-@@ -1862,6 +1836,39 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
- 	return 0;
- }
- 
-+	/*
-+	 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-+	 * Return: write counters to the user passed counter struct
-+	 * NB: both 1->0 and 0->1 transitions are counted except for
-+	 *     RI where only 0->1 is counted.
-+	 */
-+
-+static int mxser_get_icount(struct tty_struct *tty,
-+		struct serial_icounter_struct *icount)
-+
-+{
-+	struct mxser_port *info = tty->driver_data;
-+	struct async_icount cnow;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&info->slock, flags);
-+	cnow = info->icount;
-+	spin_unlock_irqrestore(&info->slock, flags);
-+
-+	icount->frame = cnow.frame;
-+	icount->brk = cnow.brk;
-+	icount->overrun = cnow.overrun;
-+	icount->buf_overrun = cnow.buf_overrun;
-+	icount->parity = cnow.parity;
-+	icount->rx = cnow.rx;
-+	icount->tx = cnow.tx;
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+	return 0;
-+}
-+
- static void mxser_stoprx(struct tty_struct *tty)
- {
- 	struct mxser_port *info = tty->driver_data;
-@@ -2358,6 +2365,7 @@ static const struct tty_operations mxser_ops = {
- 	.wait_until_sent = mxser_wait_until_sent,
- 	.tiocmget = mxser_tiocmget,
- 	.tiocmset = mxser_tiocmset,
-+	.get_icount = mxser_get_icount,
- };
- 
- struct tty_port_operations mxser_port_ops = {
-diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
-index dc52f75..19b3e1d 100644
---- a/drivers/char/nozomi.c
-+++ b/drivers/char/nozomi.c
-@@ -1783,24 +1783,24 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags,
- 	return ret;
- }
- 
--static int ntty_ioctl_tiocgicount(struct port *port, void __user *argp)
-+static int ntty_tiocgicount(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount)
- {
-+	struct port *port = tty->driver_data;
- 	const struct async_icount cnow = port->tty_icount;
--	struct serial_icounter_struct icount;
--
--	icount.cts = cnow.cts;
--	icount.dsr = cnow.dsr;
--	icount.rng = cnow.rng;
--	icount.dcd = cnow.dcd;
--	icount.rx = cnow.rx;
--	icount.tx = cnow.tx;
--	icount.frame = cnow.frame;
--	icount.overrun = cnow.overrun;
--	icount.parity = cnow.parity;
--	icount.brk = cnow.brk;
--	icount.buf_overrun = cnow.buf_overrun;
--
--	return copy_to_user(argp, &icount, sizeof(icount)) ? -EFAULT : 0;
-+
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+	icount->rx = cnow.rx;
-+	icount->tx = cnow.tx;
-+	icount->frame = cnow.frame;
-+	icount->overrun = cnow.overrun;
-+	icount->parity = cnow.parity;
-+	icount->brk = cnow.brk;
-+	icount->buf_overrun = cnow.buf_overrun;
-+	return 0;
- }
- 
- static int ntty_ioctl(struct tty_struct *tty, struct file *file,
-@@ -1819,9 +1819,7 @@ static int ntty_ioctl(struct tty_struct *tty, struct file *file,
- 		rval = wait_event_interruptible(port->tty_wait,
- 				ntty_cflags_changed(port, arg, &cprev));
- 		break;
--	} case TIOCGICOUNT:
--		rval = ntty_ioctl_tiocgicount(port, argp);
--		break;
-+	}
- 	default:
- 		DBG1("ERR: 0x%08X, %d", cmd, cmd);
- 		break;
-@@ -1895,6 +1893,7 @@ static const struct tty_operations tty_ops = {
- 	.chars_in_buffer = ntty_chars_in_buffer,
- 	.tiocmget = ntty_tiocmget,
- 	.tiocmset = ntty_tiocmset,
-+	.get_icount = ntty_tiocgicount,
- };
- 
- /* Module initialization */
-diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
-index a08c899..74d124b 100644
---- a/drivers/char/pcmcia/synclink_cs.c
-+++ b/drivers/char/pcmcia/synclink_cs.c
-@@ -2252,6 +2252,32 @@ static int mgslpc_break(struct tty_struct *tty, int break_state)
- 	return 0;
- }
- 
-+static int mgslpc_get_icount(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount)
-+{
-+	MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data;
-+	struct mgsl_icount cnow;	/* kernel counter temps */
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&info->lock,flags);
-+	cnow = info->icount;
-+	spin_unlock_irqrestore(&info->lock,flags);
-+
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+	icount->rx = cnow.rx;
-+	icount->tx = cnow.tx;
-+	icount->frame = cnow.frame;
-+	icount->overrun = cnow.overrun;
-+	icount->parity = cnow.parity;
-+	icount->brk = cnow.brk;
-+	icount->buf_overrun = cnow.buf_overrun;
-+
-+	return 0;
-+}
-+
- /* Service an IOCTL request
-  *
-  * Arguments:
-@@ -2267,11 +2293,7 @@ static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,
- 			unsigned int cmd, unsigned long arg)
- {
- 	MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data;
--	int error;
--	struct mgsl_icount cnow;	/* kernel counter temps */
--	struct serial_icounter_struct __user *p_cuser;	/* user space */
- 	void __user *argp = (void __user *)arg;
--	unsigned long flags;
- 
- 	if (debug_level >= DEBUG_LEVEL_INFO)
- 		printk("%s(%d):mgslpc_ioctl %s cmd=%08X\n", __FILE__,__LINE__,
-@@ -2281,7 +2303,7 @@ static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,
- 		return -ENODEV;
- 
- 	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
--	    (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-+	    (cmd != TIOCMIWAIT)) {
- 		if (tty->flags & (1 << TTY_IO_ERROR))
- 		    return -EIO;
- 	}
-@@ -2311,34 +2333,6 @@ static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,
- 		return wait_events(info, argp);
- 	case TIOCMIWAIT:
- 		return modem_input_wait(info,(int)arg);
--	case TIOCGICOUNT:
--		spin_lock_irqsave(&info->lock,flags);
--		cnow = info->icount;
--		spin_unlock_irqrestore(&info->lock,flags);
--		p_cuser = argp;
--		PUT_USER(error,cnow.cts, &p_cuser->cts);
--		if (error) return error;
--		PUT_USER(error,cnow.dsr, &p_cuser->dsr);
--		if (error) return error;
--		PUT_USER(error,cnow.rng, &p_cuser->rng);
--		if (error) return error;
--		PUT_USER(error,cnow.dcd, &p_cuser->dcd);
--		if (error) return error;
--		PUT_USER(error,cnow.rx, &p_cuser->rx);
--		if (error) return error;
--		PUT_USER(error,cnow.tx, &p_cuser->tx);
--		if (error) return error;
--		PUT_USER(error,cnow.frame, &p_cuser->frame);
--		if (error) return error;
--		PUT_USER(error,cnow.overrun, &p_cuser->overrun);
--		if (error) return error;
--		PUT_USER(error,cnow.parity, &p_cuser->parity);
--		if (error) return error;
--		PUT_USER(error,cnow.brk, &p_cuser->brk);
--		if (error) return error;
--		PUT_USER(error,cnow.buf_overrun, &p_cuser->buf_overrun);
--		if (error) return error;
--		return 0;
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
-diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
-index 4846b73..b118959 100644
---- a/drivers/char/synclink.c
-+++ b/drivers/char/synclink.c
-@@ -2920,6 +2920,38 @@ static int mgsl_break(struct tty_struct *tty, int break_state)
- 	
- }	/* end of mgsl_break() */
- 
-+/*
-+ * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-+ * Return: write counters to the user passed counter struct
-+ * NB: both 1->0 and 0->1 transitions are counted except for
-+ *     RI where only 0->1 is counted.
-+ */
-+static int msgl_get_icount(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount)
-+
-+{
-+	struct mgsl_struct * info = tty->driver_data;
-+	struct mgsl_icount cnow;	/* kernel counter temps */
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&info->irq_spinlock,flags);
-+	cnow = info->icount;
-+	spin_unlock_irqrestore(&info->irq_spinlock,flags);
-+
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+	icount->rx = cnow.rx;
-+	icount->tx = cnow.tx;
-+	icount->frame = cnow.frame;
-+	icount->overrun = cnow.overrun;
-+	icount->parity = cnow.parity;
-+	icount->brk = cnow.brk;
-+	icount->buf_overrun = cnow.buf_overrun;
-+	return 0;
-+}
-+
- /* mgsl_ioctl()	Service an IOCTL request
-  * 	
-  * Arguments:
-@@ -2945,7 +2977,7 @@ static int mgsl_ioctl(struct tty_struct *tty, struct file * file,
- 		return -ENODEV;
- 
- 	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
--	    (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-+	    (cmd != TIOCMIWAIT)) {
- 		if (tty->flags & (1 << TTY_IO_ERROR))
- 		    return -EIO;
- 	}
-@@ -2958,11 +2990,7 @@ static int mgsl_ioctl(struct tty_struct *tty, struct file * file,
- 
- static int mgsl_ioctl_common(struct mgsl_struct *info, unsigned int cmd, unsigned long arg)
- {
--	int error;
--	struct mgsl_icount cnow;	/* kernel counter temps */
- 	void __user *argp = (void __user *)arg;
--	struct serial_icounter_struct __user *p_cuser;	/* user space */
--	unsigned long flags;
- 	
- 	switch (cmd) {
- 		case MGSL_IOCGPARAMS:
-@@ -2991,40 +3019,6 @@ static int mgsl_ioctl_common(struct mgsl_struct *info, unsigned int cmd, unsigne
- 		case TIOCMIWAIT:
- 			return modem_input_wait(info,(int)arg);
- 
--		/* 
--		 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
--		 * Return: write counters to the user passed counter struct
--		 * NB: both 1->0 and 0->1 transitions are counted except for
--		 *     RI where only 0->1 is counted.
--		 */
--		case TIOCGICOUNT:
--			spin_lock_irqsave(&info->irq_spinlock,flags);
--			cnow = info->icount;
--			spin_unlock_irqrestore(&info->irq_spinlock,flags);
--			p_cuser = argp;
--			PUT_USER(error,cnow.cts, &p_cuser->cts);
--			if (error) return error;
--			PUT_USER(error,cnow.dsr, &p_cuser->dsr);
--			if (error) return error;
--			PUT_USER(error,cnow.rng, &p_cuser->rng);
--			if (error) return error;
--			PUT_USER(error,cnow.dcd, &p_cuser->dcd);
--			if (error) return error;
--			PUT_USER(error,cnow.rx, &p_cuser->rx);
--			if (error) return error;
--			PUT_USER(error,cnow.tx, &p_cuser->tx);
--			if (error) return error;
--			PUT_USER(error,cnow.frame, &p_cuser->frame);
--			if (error) return error;
--			PUT_USER(error,cnow.overrun, &p_cuser->overrun);
--			if (error) return error;
--			PUT_USER(error,cnow.parity, &p_cuser->parity);
--			if (error) return error;
--			PUT_USER(error,cnow.brk, &p_cuser->brk);
--			if (error) return error;
--			PUT_USER(error,cnow.buf_overrun, &p_cuser->buf_overrun);
--			if (error) return error;
--			return 0;
- 		default:
- 			return -ENOIOCTLCMD;
- 	}
-@@ -4325,6 +4319,7 @@ static const struct tty_operations mgsl_ops = {
- 	.hangup = mgsl_hangup,
- 	.tiocmget = tiocmget,
- 	.tiocmset = tiocmset,
-+	.get_icount = msgl_get_icount,
- 	.proc_fops = &mgsl_proc_fops,
- };
- 
-diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
-index 8678f0c..c300ff6 100644
---- a/drivers/char/synclink_gt.c
-+++ b/drivers/char/synclink_gt.c
-@@ -1057,9 +1057,6 @@ static int ioctl(struct tty_struct *tty, struct file *file,
- 		 unsigned int cmd, unsigned long arg)
- {
- 	struct slgt_info *info = tty->driver_data;
--	struct mgsl_icount cnow;	/* kernel counter temps */
--	struct serial_icounter_struct __user *p_cuser;	/* user space */
--	unsigned long flags;
- 	void __user *argp = (void __user *)arg;
- 	int ret;
- 
-@@ -1068,7 +1065,7 @@ static int ioctl(struct tty_struct *tty, struct file *file,
- 	DBGINFO(("%s ioctl() cmd=%08X\n", info->device_name, cmd));
- 
- 	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
--	    (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-+	    (cmd != TIOCMIWAIT)) {
- 		if (tty->flags & (1 << TTY_IO_ERROR))
- 		    return -EIO;
- 	}
-@@ -1121,25 +1118,6 @@ static int ioctl(struct tty_struct *tty, struct file *file,
- 	case MGSL_IOCWAITGPIO:
- 		ret = wait_gpio(info, argp);
- 		break;
--	case TIOCGICOUNT:
--		spin_lock_irqsave(&info->lock,flags);
--		cnow = info->icount;
--		spin_unlock_irqrestore(&info->lock,flags);
--		p_cuser = argp;
--		if (put_user(cnow.cts, &p_cuser->cts) ||
--		    put_user(cnow.dsr, &p_cuser->dsr) ||
--		    put_user(cnow.rng, &p_cuser->rng) ||
--		    put_user(cnow.dcd, &p_cuser->dcd) ||
--		    put_user(cnow.rx, &p_cuser->rx) ||
--		    put_user(cnow.tx, &p_cuser->tx) ||
--		    put_user(cnow.frame, &p_cuser->frame) ||
--		    put_user(cnow.overrun, &p_cuser->overrun) ||
--		    put_user(cnow.parity, &p_cuser->parity) ||
--		    put_user(cnow.brk, &p_cuser->brk) ||
--		    put_user(cnow.buf_overrun, &p_cuser->buf_overrun))
--			ret = -EFAULT;
--		ret = 0;
--		break;
- 	default:
- 		ret = -ENOIOCTLCMD;
- 	}
-@@ -1147,6 +1125,33 @@ static int ioctl(struct tty_struct *tty, struct file *file,
- 	return ret;
- }
- 
-+static int get_icount(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount)
-+
-+{
-+	struct slgt_info *info = tty->driver_data;
-+	struct mgsl_icount cnow;	/* kernel counter temps */
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&info->lock,flags);
-+	cnow = info->icount;
-+	spin_unlock_irqrestore(&info->lock,flags);
-+
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+	icount->rx = cnow.rx;
-+	icount->tx = cnow.tx;
-+	icount->frame = cnow.frame;
-+	icount->overrun = cnow.overrun;
-+	icount->parity = cnow.parity;
-+	icount->brk = cnow.brk;
-+	icount->buf_overrun = cnow.buf_overrun;
-+
-+	return 0;
-+}
-+
- /*
-  * support for 32 bit ioctl calls on 64 bit systems
-  */
-@@ -1236,10 +1241,6 @@ static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file,
- 	case MGSL_IOCSGPIO:
- 	case MGSL_IOCGGPIO:
- 	case MGSL_IOCWAITGPIO:
--	case TIOCGICOUNT:
--		rc = ioctl(tty, file, cmd, (unsigned long)(compat_ptr(arg)));
--		break;
--
- 	case MGSL_IOCSTXIDLE:
- 	case MGSL_IOCTXENABLE:
- 	case MGSL_IOCRXENABLE:
-@@ -3639,6 +3640,7 @@ static const struct tty_operations ops = {
- 	.hangup = hangup,
- 	.tiocmget = tiocmget,
- 	.tiocmset = tiocmset,
-+	.get_icount = get_icount,
- 	.proc_fops = &synclink_gt_proc_fops,
- };
- 
-diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
-index 2b18adc..951b65f 100644
---- a/drivers/char/synclinkmp.c
-+++ b/drivers/char/synclinkmp.c
-@@ -1255,10 +1255,6 @@ static int do_ioctl(struct tty_struct *tty, struct file *file,
- 		 unsigned int cmd, unsigned long arg)
- {
- 	SLMP_INFO *info = tty->driver_data;
--	int error;
--	struct mgsl_icount cnow;	/* kernel counter temps */
--	struct serial_icounter_struct __user *p_cuser;	/* user space */
--	unsigned long flags;
- 	void __user *argp = (void __user *)arg;
- 
- 	if (debug_level >= DEBUG_LEVEL_INFO)
-@@ -1269,7 +1265,7 @@ static int do_ioctl(struct tty_struct *tty, struct file *file,
- 		return -ENODEV;
- 
- 	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
--	    (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-+	    (cmd != TIOCMIWAIT)) {
- 		if (tty->flags & (1 << TTY_IO_ERROR))
- 		    return -EIO;
- 	}
-@@ -1307,40 +1303,38 @@ static int do_ioctl(struct tty_struct *tty, struct file *file,
- 		 * NB: both 1->0 and 0->1 transitions are counted except for
- 		 *     RI where only 0->1 is counted.
- 		 */
--	case TIOCGICOUNT:
--		spin_lock_irqsave(&info->lock,flags);
--		cnow = info->icount;
--		spin_unlock_irqrestore(&info->lock,flags);
--		p_cuser = argp;
--		PUT_USER(error,cnow.cts, &p_cuser->cts);
--		if (error) return error;
--		PUT_USER(error,cnow.dsr, &p_cuser->dsr);
--		if (error) return error;
--		PUT_USER(error,cnow.rng, &p_cuser->rng);
--		if (error) return error;
--		PUT_USER(error,cnow.dcd, &p_cuser->dcd);
--		if (error) return error;
--		PUT_USER(error,cnow.rx, &p_cuser->rx);
--		if (error) return error;
--		PUT_USER(error,cnow.tx, &p_cuser->tx);
--		if (error) return error;
--		PUT_USER(error,cnow.frame, &p_cuser->frame);
--		if (error) return error;
--		PUT_USER(error,cnow.overrun, &p_cuser->overrun);
--		if (error) return error;
--		PUT_USER(error,cnow.parity, &p_cuser->parity);
--		if (error) return error;
--		PUT_USER(error,cnow.brk, &p_cuser->brk);
--		if (error) return error;
--		PUT_USER(error,cnow.buf_overrun, &p_cuser->buf_overrun);
--		if (error) return error;
--		return 0;
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
- 	return 0;
- }
- 
-+static int get_icount(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount)
-+{
-+	SLMP_INFO *info = tty->driver_data;
-+	struct mgsl_icount cnow;	/* kernel counter temps */
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&info->lock,flags);
-+	cnow = info->icount;
-+	spin_unlock_irqrestore(&info->lock,flags);
-+
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+	icount->rx = cnow.rx;
-+	icount->tx = cnow.tx;
-+	icount->frame = cnow.frame;
-+	icount->overrun = cnow.overrun;
-+	icount->parity = cnow.parity;
-+	icount->brk = cnow.brk;
-+	icount->buf_overrun = cnow.buf_overrun;
-+
-+	return 0;
-+}
-+
- static int ioctl(struct tty_struct *tty, struct file *file,
- 		 unsigned int cmd, unsigned long arg)
- {
-@@ -3908,6 +3902,7 @@ static const struct tty_operations ops = {
- 	.hangup = hangup,
- 	.tiocmget = tiocmget,
- 	.tiocmset = tiocmset,
-+	.get_icount = get_icount,
- 	.proc_fops = &synclinkmp_proc_fops,
- };
- 
-diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
-index 53ffcfc..123cedf 100644
---- a/drivers/char/tty_io.c
-+++ b/drivers/char/tty_io.c
-@@ -96,6 +96,7 @@
- #include <linux/bitops.h>
- #include <linux/delay.h>
- #include <linux/seq_file.h>
-+#include <linux/serial.h>
- 
- #include <linux/uaccess.h>
- #include <asm/system.h>
-@@ -2436,6 +2437,20 @@ static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int
- 	return tty->ops->tiocmset(tty, file, set, clear);
- }
- 
-+static int tty_tiocgicount(struct tty_struct *tty, void __user *arg)
-+{
-+	int retval = -EINVAL;
-+	struct serial_icounter_struct icount;
-+	memset(&icount, 0, sizeof(icount));
-+	if (tty->ops->get_icount)
-+		retval = tty->ops->get_icount(tty, &icount);
-+	if (retval != 0)
-+		return retval;
-+	if (copy_to_user(arg, &icount, sizeof(icount)))
-+		return -EFAULT;
-+	return 0;
-+}
-+
- struct tty_struct *tty_pair_get_tty(struct tty_struct *tty)
- {
- 	if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-@@ -2556,6 +2571,12 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- 	case TIOCMBIC:
- 	case TIOCMBIS:
- 		return tty_tiocmset(tty, file, cmd, p);
-+	case TIOCGICOUNT:
-+		retval = tty_tiocgicount(tty, p);
-+		/* For the moment allow fall through to the old method */
-+        	if (retval != -EINVAL)
-+			return retval;
-+		break;
- 	case TCFLSH:
- 		switch (arg) {
- 		case TCIFLUSH:
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 3ada62b..27a3074 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -482,14 +482,17 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
- 		return -EBADF;
- 	obj_priv = obj->driver_private;
- 
--	/* Bounds check source.
--	 *
--	 * XXX: This could use review for overflow issues...
--	 */
--	if (args->offset > obj->size || args->size > obj->size ||
--	    args->offset + args->size > obj->size) {
--		drm_gem_object_unreference(obj);
--		return -EINVAL;
-+	/* Bounds check source.  */
-+	if (args->offset > obj->size || args->size > obj->size - args->offset) {
-+		ret = -EINVAL;
-+		goto err;
-+	}
-+
-+	if (!access_ok(VERIFY_WRITE,
-+		       (char __user *)(uintptr_t)args->data_ptr,
-+		       args->size)) {
-+		ret = -EFAULT;
-+		goto err;
- 	}
- 
- 	if (i915_gem_object_needs_bit17_swizzle(obj)) {
-@@ -501,8 +504,8 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
- 							file_priv);
- 	}
- 
-+err:
- 	drm_gem_object_unreference(obj);
--
- 	return ret;
- }
- 
-@@ -592,8 +595,6 @@ i915_gem_gtt_pwrite_fast(struct drm_device *dev, struct drm_gem_object *obj,
- 
- 	user_data = (char __user *) (uintptr_t) args->data_ptr;
- 	remain = args->size;
--	if (!access_ok(VERIFY_READ, user_data, remain))
--		return -EFAULT;
- 
- 
- 	mutex_lock(&dev->struct_mutex);
-@@ -955,14 +956,17 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
- 		return -EBADF;
- 	obj_priv = obj->driver_private;
- 
--	/* Bounds check destination.
--	 *
--	 * XXX: This could use review for overflow issues...
--	 */
--	if (args->offset > obj->size || args->size > obj->size ||
--	    args->offset + args->size > obj->size) {
--		drm_gem_object_unreference(obj);
--		return -EINVAL;
-+	/* Bounds check destination. */
-+	if (args->offset > obj->size || args->size > obj->size - args->offset) {
-+		ret = -EINVAL;
-+		goto err;
-+	}
-+
-+	if (!access_ok(VERIFY_READ,
-+		       (char __user *)(uintptr_t)args->data_ptr,
-+		       args->size)) {
-+		ret = -EFAULT;
-+		goto err;
- 	}
- 
- 	/* We can only do the GTT pwrite on untiled buffers, as otherwise
-@@ -995,8 +999,8 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
- 		DRM_INFO("pwrite failed %d\n", ret);
- #endif
- 
-+err:
- 	drm_gem_object_unreference(obj);
--
- 	return ret;
- }
- 
-diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index cf59d64..883215d 100644
---- a/drivers/md/raid5.c
-+++ b/drivers/md/raid5.c
-@@ -3038,12 +3038,16 @@ static void handle_stripe5(struct stripe_head *sh)
- 	/* check if the array has lost two devices and, if so, some requests might
- 	 * need to be failed
- 	 */
--	if (s.failed > 1 && s.to_read+s.to_write+s.written)
--		handle_failed_stripe(conf, sh, &s, disks, &return_bi);
--	if (s.failed > 1 && s.syncing) {
--		md_done_sync(conf->mddev, STRIPE_SECTORS,0);
--		clear_bit(STRIPE_SYNCING, &sh->state);
--		s.syncing = 0;
-+	if (s.failed > 1) {
-+		sh->check_state = 0;
-+		sh->reconstruct_state = 0;
-+		if (s.to_read+s.to_write+s.written)
-+			handle_failed_stripe(conf, sh, &s, disks, &return_bi);
-+		if (s.syncing) {
-+			md_done_sync(conf->mddev, STRIPE_SECTORS,0);
-+			clear_bit(STRIPE_SYNCING, &sh->state);
-+			s.syncing = 0;
-+		}
- 	}
- 
- 	/* might be able to return some write requests if the parity block
-@@ -3314,12 +3318,16 @@ static void handle_stripe6(struct stripe_head *sh)
- 	/* check if the array has lost >2 devices and, if so, some requests
- 	 * might need to be failed
- 	 */
--	if (s.failed > 2 && s.to_read+s.to_write+s.written)
--		handle_failed_stripe(conf, sh, &s, disks, &return_bi);
--	if (s.failed > 2 && s.syncing) {
--		md_done_sync(conf->mddev, STRIPE_SECTORS,0);
--		clear_bit(STRIPE_SYNCING, &sh->state);
--		s.syncing = 0;
-+	if (s.failed > 2) {
-+		sh->check_state = 0;
-+		sh->reconstruct_state = 0;
-+		if (s.to_read+s.to_write+s.written)
-+			handle_failed_stripe(conf, sh, &s, disks, &return_bi);
-+		if (s.syncing) {
-+			md_done_sync(conf->mddev, STRIPE_SECTORS,0);
-+			clear_bit(STRIPE_SYNCING, &sh->state);
-+			s.syncing = 0;
-+		}
- 	}
- 
- 	/*
-diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
-index 5b081cb..726a1b8 100644
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -290,6 +290,7 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
- 			ops.mode = MTD_OOB_RAW;
- 			ops.datbuf = kbuf;
- 			ops.oobbuf = NULL;
-+			ops.ooboffs = 0;
- 			ops.len = len;
- 
- 			ret = mtd->write_oob(mtd, *ppos, &ops);
-diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
-index 554626e..d03a926 100644
---- a/drivers/scsi/hosts.c
-+++ b/drivers/scsi/hosts.c
-@@ -275,6 +275,7 @@ static void scsi_host_dev_release(struct device *dev)
- {
- 	struct Scsi_Host *shost = dev_to_shost(dev);
- 	struct device *parent = dev->parent;
-+	struct request_queue *q;
- 
- 	scsi_proc_hostdir_rm(shost->hostt);
- 
-@@ -282,9 +283,11 @@ static void scsi_host_dev_release(struct device *dev)
- 		kthread_stop(shost->ehandler);
- 	if (shost->work_q)
- 		destroy_workqueue(shost->work_q);
--	if (shost->uspace_req_q) {
--		kfree(shost->uspace_req_q->queuedata);
--		scsi_free_queue(shost->uspace_req_q);
-+	q = shost->uspace_req_q;
-+	if (q) {
-+		kfree(q->queuedata);
-+		q->queuedata = NULL;
-+		scsi_free_queue(q);
- 	}
- 
- 	scsi_destroy_command_freelist(shost);
-diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index 1492e3e..1ae7b7c 100644
---- a/drivers/scsi/scsi_lib.c
-+++ b/drivers/scsi/scsi_lib.c
-@@ -1672,6 +1672,15 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev)
- 
- void scsi_free_queue(struct request_queue *q)
- {
-+	unsigned long flags;
-+
-+	WARN_ON(q->queuedata);
-+
-+	/* cause scsi_request_fn() to kill all non-finished requests */
-+	spin_lock_irqsave(q->queue_lock, flags);
-+	q->request_fn(q);
-+	spin_unlock_irqrestore(q->queue_lock, flags);
-+
- 	blk_cleanup_queue(q);
- }
- 
-diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
-index 5081f97..723da1d 100644
---- a/drivers/scsi/st.c
-+++ b/drivers/scsi/st.c
-@@ -461,14 +461,16 @@ static void st_scsi_execute_end(struct request *req, int uptodate)
- {
- 	struct st_request *SRpnt = req->end_io_data;
- 	struct scsi_tape *STp = SRpnt->stp;
-+	struct bio *tmp;
- 
- 	STp->buffer->cmdstat.midlevel_result = SRpnt->result = req->errors;
- 	STp->buffer->cmdstat.residual = req->resid_len;
- 
-+	tmp = SRpnt->bio;
- 	if (SRpnt->waiting)
- 		complete(SRpnt->waiting);
- 
--	blk_rq_unmap_user(SRpnt->bio);
-+	blk_rq_unmap_user(tmp);
- 	__blk_put_request(req->q, req);
- }
- 
-diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
-index 24661cd..1e4f831 100644
---- a/drivers/serial/68360serial.c
-+++ b/drivers/serial/68360serial.c
-@@ -1381,6 +1381,30 @@ static void send_break(ser_info_t *info, unsigned int duration)
- }
- 
- 
-+/*
-+ * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-+ * Return: write counters to the user passed counter struct
-+ * NB: both 1->0 and 0->1 transitions are counted except for
-+ *     RI where only 0->1 is counted.
-+ */
-+static int rs_360_get_icount(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount)
-+{
-+	ser_info_t *info = (ser_info_t *)tty->driver_data;
-+	struct async_icount cnow;
-+
-+	local_irq_disable();
-+	cnow = info->state->icount;
-+	local_irq_enable();
-+
-+	icount->cts = cnow.cts;
-+	icount->dsr = cnow.dsr;
-+	icount->rng = cnow.rng;
-+	icount->dcd = cnow.dcd;
-+
-+	return 0;
-+}
-+
- static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
- 		    unsigned int cmd, unsigned long arg)
- {
-@@ -1394,7 +1418,7 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
- 	if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
- 		return -ENODEV;
- 
--	if ((cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-+	if (cmd != TIOCMIWAIT) {
- 		if (tty->flags & (1 << TTY_IO_ERROR))
- 		    return -EIO;
- 	}
-@@ -1477,31 +1501,6 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
- 			return 0;
- #endif
- 
--		/* 
--		 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
--		 * Return: write counters to the user passed counter struct
--		 * NB: both 1->0 and 0->1 transitions are counted except for
--		 *     RI where only 0->1 is counted.
--		 */
--		case TIOCGICOUNT:
--			local_irq_disable();
--			cnow = info->state->icount;
--			local_irq_enable();
--			p_cuser = (struct serial_icounter_struct *) arg;
--/* 			error = put_user(cnow.cts, &p_cuser->cts); */
--/* 			if (error) return error; */
--/* 			error = put_user(cnow.dsr, &p_cuser->dsr); */
--/* 			if (error) return error; */
--/* 			error = put_user(cnow.rng, &p_cuser->rng); */
--/* 			if (error) return error; */
--/* 			error = put_user(cnow.dcd, &p_cuser->dcd); */
--/* 			if (error) return error; */
--
--			put_user(cnow.cts, &p_cuser->cts);
--			put_user(cnow.dsr, &p_cuser->dsr);
--			put_user(cnow.rng, &p_cuser->rng);
--			put_user(cnow.dcd, &p_cuser->dcd);
--			return 0;
- 
- 		default:
- 			return -ENOIOCTLCMD;
-diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
-index dcc7244..772d9d8 100644
---- a/drivers/serial/serial_core.c
-+++ b/drivers/serial/serial_core.c
-@@ -1067,10 +1067,10 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)
-  * NB: both 1->0 and 0->1 transitions are counted except for
-  *     RI where only 0->1 is counted.
-  */
--static int uart_get_count(struct uart_state *state,
--			  struct serial_icounter_struct __user *icnt)
-+static int uart_get_icount(struct tty_struct *tty,
-+			  struct serial_icounter_struct *icount)
- {
--	struct serial_icounter_struct icount;
-+	struct uart_state *state = tty->driver_data;
- 	struct uart_icount cnow;
- 	struct uart_port *uport = state->uart_port;
- 
-@@ -1078,19 +1078,19 @@ static int uart_get_count(struct uart_state *state,
- 	memcpy(&cnow, &uport->icount, sizeof(struct uart_icount));
- 	spin_unlock_irq(&uport->lock);
- 
--	icount.cts         = cnow.cts;
--	icount.dsr         = cnow.dsr;
--	icount.rng         = cnow.rng;
--	icount.dcd         = cnow.dcd;
--	icount.rx          = cnow.rx;
--	icount.tx          = cnow.tx;
--	icount.frame       = cnow.frame;
--	icount.overrun     = cnow.overrun;
--	icount.parity      = cnow.parity;
--	icount.brk         = cnow.brk;
--	icount.buf_overrun = cnow.buf_overrun;
-+	icount->cts         = cnow.cts;
-+	icount->dsr         = cnow.dsr;
-+	icount->rng         = cnow.rng;
-+	icount->dcd         = cnow.dcd;
-+	icount->rx          = cnow.rx;
-+	icount->tx          = cnow.tx;
-+	icount->frame       = cnow.frame;
-+	icount->overrun     = cnow.overrun;
-+	icount->parity      = cnow.parity;
-+	icount->brk         = cnow.brk;
-+	icount->buf_overrun = cnow.buf_overrun;
- 
--	return copy_to_user(icnt, &icount, sizeof(icount)) ? -EFAULT : 0;
-+	return 0;
- }
- 
- /*
-@@ -1143,10 +1143,6 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
- 	case TIOCMIWAIT:
- 		ret = uart_wait_modem_status(state, arg);
- 		break;
--
--	case TIOCGICOUNT:
--		ret = uart_get_count(state, uarg);
--		break;
- 	}
- 
- 	if (ret != -ENOIOCTLCMD)
-@@ -2322,6 +2318,7 @@ static const struct tty_operations uart_ops = {
- #endif
- 	.tiocmget	= uart_tiocmget,
- 	.tiocmset	= uart_tiocmset,
-+	.get_icount	= uart_get_icount,
- #ifdef CONFIG_CONSOLE_POLL
- 	.poll_init	= uart_poll_init,
- 	.poll_get_char	= uart_poll_get_char,
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 93448eb..e163df9 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -47,15 +47,42 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	/* Logitech Webcam B/C500 */
- 	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C600 */
-+	{ USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Webcam Pro 9000 */
- 	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C905 */
-+	{ USB_DEVICE(0x046d, 0x080a), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C210 */
-+	{ USB_DEVICE(0x046d, 0x0819), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C260 */
-+	{ USB_DEVICE(0x046d, 0x081a), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Webcam C310 */
- 	{ USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C910 */
-+	{ USB_DEVICE(0x046d, 0x0821), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C160 */
-+	{ USB_DEVICE(0x046d, 0x0824), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Webcam C270 */
- 	{ USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Quickcam Pro 9000 */
-+	{ USB_DEVICE(0x046d, 0x0990), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Quickcam E3500 */
-+	{ USB_DEVICE(0x046d, 0x09a4), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Quickcam Vision Pro */
-+	{ USB_DEVICE(0x046d, 0x09a6), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Harmony 700-series */
- 	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
- 
-diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
-index 7a4b41c..5689b90 100644
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -2355,13 +2355,19 @@ static void ftdi_set_termios(struct tty_struct *tty,
- 
- 	cflag = termios->c_cflag;
- 
--	/* FIXME -For this cut I don't care if the line is really changing or
--	   not  - so just do the change regardless  - should be able to
--	   compare old_termios and tty->termios */
-+	if (old_termios->c_cflag == termios->c_cflag
-+	    && old_termios->c_ispeed == termios->c_ispeed
-+	    && old_termios->c_ospeed == termios->c_ospeed)
-+		goto no_c_cflag_changes;
-+
- 	/* NOTE These routines can get interrupted by
- 	   ftdi_sio_read_bulk_callback  - need to examine what this means -
- 	   don't see any problems yet */
- 
-+	if ((old_termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB)) ==
-+	    (termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB)))
-+		goto no_data_parity_stop_changes;
-+
- 	/* Set number of data bits, parity, stop bits */
- 
- 	termios->c_cflag &= ~CMSPAR;
-@@ -2398,6 +2404,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
- 	}
- 
- 	/* Now do the baudrate */
-+no_data_parity_stop_changes:
- 	if ((cflag & CBAUD) == B0) {
- 		/* Disable flow control */
- 		if (usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-@@ -2423,6 +2430,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
- 
- 	/* Set flow control */
- 	/* Note device also supports DTR/CD (ugh) and Xon/Xoff in hardware */
-+no_c_cflag_changes:
- 	if (cflag & CRTSCTS) {
- 		dbg("%s Setting to CRTSCTS flow control", __func__);
- 		if (usb_control_msg(dev,
-diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
-index 150cad4..9f89940 100644
---- a/drivers/usb/serial/pl2303.c
-+++ b/drivers/usb/serial/pl2303.c
-@@ -101,7 +101,6 @@ static struct usb_device_id id_table [] = {
- 	{ USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
- 	{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
- 	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
--	{ USB_DEVICE(WINCHIPHEAD_VENDOR_ID, WINCHIPHEAD_USBSER_PRODUCT_ID) },
- 	{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
- 	{ }					/* Terminating entry */
- };
-diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
-index 3d10d7f..c38b8c0 100644
---- a/drivers/usb/serial/pl2303.h
-+++ b/drivers/usb/serial/pl2303.h
-@@ -145,10 +145,6 @@
- #define ADLINK_VENDOR_ID		0x0b63
- #define ADLINK_ND6530_PRODUCT_ID	0x6530
- 
--/* WinChipHead USB->RS 232 adapter */
--#define WINCHIPHEAD_VENDOR_ID		0x4348
--#define WINCHIPHEAD_USBSER_PRODUCT_ID	0x5523
--
- /* SMART USB Serial Adapter */
- #define SMART_VENDOR_ID	0x0b8c
- #define SMART_PRODUCT_ID	0x2303
-diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
-index bd3fa7f..f23f3b4 100644
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -562,6 +562,18 @@ static int serial_tiocmset(struct tty_struct *tty, struct file *file,
- 	return -EINVAL;
- }
- 
-+static int serial_get_icount(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount)
-+{
-+	struct usb_serial_port *port = tty->driver_data;
-+
-+	dbg("%s - port %d", __func__, port->number);
-+
-+	if (port->serial->type->get_icount)
-+		return port->serial->type->get_icount(tty, icount);
-+	return -EINVAL;
-+}
-+
- /*
-  * We would be calling tty_wakeup here, but unfortunately some line
-  * disciplines have an annoying habit of calling tty->write from
-@@ -1214,6 +1226,7 @@ static const struct tty_operations serial_ops = {
- 	.chars_in_buffer =	serial_chars_in_buffer,
- 	.tiocmget =		serial_tiocmget,
- 	.tiocmset =		serial_tiocmset,
-+	.get_icount = 		serial_get_icount,
- 	.cleanup = 		serial_cleanup,
- 	.install = 		serial_install,
- 	.proc_fops =		&serial_proc_fops,
-diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
-index fc310f7..0fded39 100644
---- a/drivers/usb/storage/protocol.c
-+++ b/drivers/usb/storage/protocol.c
-@@ -58,7 +58,9 @@
- 
- void usb_stor_pad12_command(struct scsi_cmnd *srb, struct us_data *us)
- {
--	/* Pad the SCSI command with zeros out to 12 bytes
-+	/*
-+	 * Pad the SCSI command with zeros out to 12 bytes.  If the
-+	 * command already is 12 bytes or longer, leave it alone.
- 	 *
- 	 * NOTE: This only works because a scsi_cmnd struct field contains
- 	 * a unsigned char cmnd[16], so we know we have storage available
-@@ -66,9 +68,6 @@ void usb_stor_pad12_command(struct scsi_cmnd *srb, struct us_data *us)
- 	for (; srb->cmd_len<12; srb->cmd_len++)
- 		srb->cmnd[srb->cmd_len] = 0;
- 
--	/* set command length to 12 bytes */
--	srb->cmd_len = 12;
--
- 	/* send the command to the transport layer */
- 	usb_stor_invoke_transport(srb, us);
- }
-diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index 009ca4e..15ed43e 100644
---- a/drivers/xen/events.c
-+++ b/drivers/xen/events.c
-@@ -536,7 +536,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
- 	if (irq < 0)
- 		return irq;
- 
--	irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME;
-+	irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME | IRQF_EARLY_RESUME;
- 	retval = request_irq(irq, handler, irqflags, devname, dev_id);
- 	if (retval != 0) {
- 		unbind_from_irq(irq);
-diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c
-index e673a88..b1ce4c7 100644
---- a/fs/hfs/trans.c
-+++ b/fs/hfs/trans.c
-@@ -40,6 +40,8 @@ int hfs_mac2asc(struct super_block *sb, char *out, const struct hfs_name *in)
- 
- 	src = in->name;
- 	srclen = in->len;
-+	if (srclen > HFS_NAMELEN)
-+		srclen = HFS_NAMELEN;
- 	dst = out;
- 	dstlen = HFS_MAX_NAMELEN;
- 	if (nls_io) {
-diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 4528f29..c739150 100644
---- a/include/linux/interrupt.h
-+++ b/include/linux/interrupt.h
-@@ -54,6 +54,8 @@
-  *                irq line disabled until the threaded handler has been run.
-  * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend
-  * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set
-+ * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device
-+ *                resume time.
-  */
- #define IRQF_DISABLED		0x00000020
- #define IRQF_SAMPLE_RANDOM	0x00000040
-@@ -66,6 +68,7 @@
- #define IRQF_ONESHOT		0x00002000
- #define IRQF_NO_SUSPEND		0x00004000
- #define IRQF_FORCE_RESUME	0x00008000
-+#define IRQF_EARLY_RESUME	0x00020000
- 
- #define IRQF_TIMER		(__IRQF_TIMER | IRQF_NO_SUSPEND)
- 
-@@ -198,13 +201,16 @@ extern void suspend_device_irqs(void);
- extern void resume_device_irqs(void);
- #ifdef CONFIG_PM_SLEEP
- extern int check_wakeup_irqs(void);
-+extern void irq_pm_syscore_resume(void);
- #else
- static inline int check_wakeup_irqs(void) { return 0; }
-+static inline void irq_pm_syscore_resume(void) { };
- #endif
- #else
- static inline void suspend_device_irqs(void) { };
- static inline void resume_device_irqs(void) { };
- static inline int check_wakeup_irqs(void) { return 0; }
-+static inline void irq_pm_syscore_resume(void) { };
- #endif
- 
- #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
-diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
-index b086779..db2d227 100644
---- a/include/linux/tty_driver.h
-+++ b/include/linux/tty_driver.h
-@@ -224,6 +224,12 @@
-  *	unless the tty also has a valid tty->termiox pointer.
-  *
-  *	Optional: Called under the termios lock
-+ *
-+ * int (*get_icount)(struct tty_struct *tty, struct serial_icounter *icount);
-+ *
-+ *	Called when the device receives a TIOCGICOUNT ioctl. Passed a kernel
-+ *	structure to complete. This method is optional and will only be called
-+ *	if provided (otherwise EINVAL will be returned).
-  */
- 
- #include <linux/fs.h>
-@@ -232,6 +238,7 @@
- 
- struct tty_struct;
- struct tty_driver;
-+struct serial_icounter_struct;
- 
- struct tty_operations {
- 	struct tty_struct * (*lookup)(struct tty_driver *driver,
-@@ -268,6 +275,8 @@ struct tty_operations {
- 			unsigned int set, unsigned int clear);
- 	int (*resize)(struct tty_struct *tty, struct winsize *ws);
- 	int (*set_termiox)(struct tty_struct *tty, struct termiox *tnew);
-+	int (*get_icount)(struct tty_struct *tty,
-+				struct serial_icounter_struct *icount);
- #ifdef CONFIG_CONSOLE_POLL
- 	int (*poll_init)(struct tty_driver *driver, int line, char *options);
- 	int (*poll_get_char)(struct tty_driver *driver, int line);
-diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
-index bb911e3..78670cb 100644
---- a/include/linux/usb/serial.h
-+++ b/include/linux/usb/serial.h
-@@ -259,6 +259,8 @@ struct usb_serial_driver {
- 	int  (*tiocmget)(struct tty_struct *tty, struct file *file);
- 	int  (*tiocmset)(struct tty_struct *tty, struct file *file,
- 			 unsigned int set, unsigned int clear);
-+	int  (*get_icount)(struct tty_struct *tty,
-+			struct serial_icounter_struct *icount);
- 	/* Called by the tty layer for port level work. There may or may not
- 	   be an attached tty at this point */
- 	void (*dtr_rts)(struct usb_serial_port *port, int on);
-diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index 3c123c3..819a634 100644
---- a/include/linux/vmalloc.h
-+++ b/include/linux/vmalloc.h
-@@ -13,6 +13,7 @@ struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
- #define VM_MAP		0x00000004	/* vmap()ed pages */
- #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
- #define VM_VPAGES	0x00000010	/* buffer for pages was vmalloc'ed */
-+#define VM_UNLIST	0x00000020	/* vm_struct is not listed in vmlist */
- /* bits [20..32] reserved for arch specific ioremap internals */
- 
- /*
-diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
-index 0067abb..b1fc3dd 100644
---- a/kernel/irq/pm.c
-+++ b/kernel/irq/pm.c
-@@ -39,25 +39,46 @@ void suspend_device_irqs(void)
- }
- EXPORT_SYMBOL_GPL(suspend_device_irqs);
- 
--/**
-- * resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs()
-- *
-- * Enable all interrupt lines previously disabled by suspend_device_irqs() that
-- * have the IRQ_SUSPENDED flag set.
-- */
--void resume_device_irqs(void)
-+static void resume_irqs(bool want_early)
- {
- 	struct irq_desc *desc;
- 	int irq;
- 
- 	for_each_irq_desc(irq, desc) {
- 		unsigned long flags;
-+		bool is_early = desc->action &&
-+			desc->action->flags & IRQF_EARLY_RESUME;
-+
-+		if (is_early != want_early)
-+			continue;
- 
- 		spin_lock_irqsave(&desc->lock, flags);
- 		__enable_irq(desc, irq, true);
- 		spin_unlock_irqrestore(&desc->lock, flags);
- 	}
- }
-+
-+/**
-+ * irq_pm_syscore_ops - enable interrupt lines early
-+ *
-+ * Enable all interrupt lines with %IRQF_EARLY_RESUME set.
-+ */
-+void irq_pm_syscore_resume(void)
-+{
-+	resume_irqs(true);
-+}
-+
-+/**
-+ * resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs()
-+ *
-+ * Enable all non-%IRQF_EARLY_RESUME interrupt lines previously
-+ * disabled by suspend_device_irqs() that have the IRQS_SUSPENDED flag
-+ * set as well as those with %IRQF_FORCE_RESUME.
-+ */
-+void resume_device_irqs(void)
-+{
-+	resume_irqs(false);
-+}
- EXPORT_SYMBOL_GPL(resume_device_irqs);
- 
- /**
-diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 6f10dfc..40dd021 100644
---- a/kernel/power/suspend.c
-+++ b/kernel/power/suspend.c
-@@ -293,7 +293,7 @@ int enter_state(suspend_state_t state)
-  */
- int pm_suspend(suspend_state_t state)
- {
--	if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX)
-+	if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX)
- 		return enter_state(state);
- 	return -EINVAL;
- }
-diff --git a/lib/nlattr.c b/lib/nlattr.c
-index c4706eb..109d4fe 100644
---- a/lib/nlattr.c
-+++ b/lib/nlattr.c
-@@ -20,6 +20,7 @@ static u16 nla_attr_minlen[NLA_TYPE_MAX+1] __read_mostly = {
- 	[NLA_U16]	= sizeof(u16),
- 	[NLA_U32]	= sizeof(u32),
- 	[NLA_U64]	= sizeof(u64),
-+	[NLA_MSECS]	= sizeof(u64),
- 	[NLA_NESTED]	= NLA_HDRLEN,
- };
- 
-diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 7221e9e..f34ffd0 100644
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1203,17 +1203,22 @@ EXPORT_SYMBOL_GPL(map_vm_area);
- DEFINE_RWLOCK(vmlist_lock);
- struct vm_struct *vmlist;
- 
--static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
-+static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
- 			      unsigned long flags, void *caller)
- {
--	struct vm_struct *tmp, **p;
--
- 	vm->flags = flags;
- 	vm->addr = (void *)va->va_start;
- 	vm->size = va->va_end - va->va_start;
- 	vm->caller = caller;
- 	va->private = vm;
- 	va->flags |= VM_VM_AREA;
-+}
-+
-+static void insert_vmalloc_vmlist(struct vm_struct *vm)
-+{
-+	struct vm_struct *tmp, **p;
-+
-+	vm->flags &= ~VM_UNLIST;
- 
- 	write_lock(&vmlist_lock);
- 	for (p = &vmlist; (tmp = *p) != NULL; p = &tmp->next) {
-@@ -1225,6 +1230,13 @@ static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
- 	write_unlock(&vmlist_lock);
- }
- 
-+static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
-+			      unsigned long flags, void *caller)
-+{
-+	setup_vmalloc_vm(vm, va, flags, caller);
-+	insert_vmalloc_vmlist(vm);
-+}
-+
- static struct vm_struct *__get_vm_area_node(unsigned long size,
- 		unsigned long align, unsigned long flags, unsigned long start,
- 		unsigned long end, int node, gfp_t gfp_mask, void *caller)
-@@ -1263,7 +1275,18 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
- 		return NULL;
- 	}
- 
--	insert_vmalloc_vm(area, va, flags, caller);
-+	/*
-+	 * When this function is called from __vmalloc_node,
-+	 * we do not add vm_struct to vmlist here to avoid
-+	 * accessing uninitialized members of vm_struct such as
-+	 * pages and nr_pages fields. They will be set later.
-+	 * To distinguish it from others, we use a VM_UNLIST flag.
-+	 */
-+	if (flags & VM_UNLIST)
-+		setup_vmalloc_vm(area, va, flags, caller);
-+	else
-+		insert_vmalloc_vm(area, va, flags, caller);
-+
- 	return area;
- }
- 
-@@ -1338,17 +1361,20 @@ struct vm_struct *remove_vm_area(const void *addr)
- 	va = find_vmap_area((unsigned long)addr);
- 	if (va && va->flags & VM_VM_AREA) {
- 		struct vm_struct *vm = va->private;
--		struct vm_struct *tmp, **p;
--		/*
--		 * remove from list and disallow access to this vm_struct
--		 * before unmap. (address range confliction is maintained by
--		 * vmap.)
--		 */
--		write_lock(&vmlist_lock);
--		for (p = &vmlist; (tmp = *p) != vm; p = &tmp->next)
--			;
--		*p = tmp->next;
--		write_unlock(&vmlist_lock);
-+
-+		if (!(vm->flags & VM_UNLIST)) {
-+			struct vm_struct *tmp, **p;
-+			/*
-+			 * remove from list and disallow access to
-+			 * this vm_struct before unmap. (address range
-+			 * confliction is maintained by vmap.)
-+			 */
-+			write_lock(&vmlist_lock);
-+			for (p = &vmlist; (tmp = *p) != vm; p = &tmp->next)
-+				;
-+			*p = tmp->next;
-+			write_unlock(&vmlist_lock);
-+		}
- 
- 		vmap_debug_free_range(va->va_start, va->va_end);
- 		free_unmap_vmap_area(va);
-@@ -1568,8 +1594,9 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
- 	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
- 		return NULL;
- 
--	area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START,
--				  VMALLOC_END, node, gfp_mask, caller);
-+	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
-+				  VMALLOC_START, VMALLOC_END, node,
-+				  gfp_mask, caller);
- 
- 	if (!area)
- 		return NULL;
-@@ -1577,6 +1604,12 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
- 	addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller);
- 
- 	/*
-+	 * In this function, newly allocated vm_struct is not added
-+	 * to vmlist at __get_vm_area_node(). so, it is added here.
-+	 */
-+	insert_vmalloc_vmlist(area);
-+
-+	/*
- 	 * A ref_count = 3 is needed because the vm_struct and vmap_area
- 	 * structures allocated in the __get_vm_area_node() function contain
- 	 * references to the virtual address of the vmalloc'ed block.
-diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
-index cab71ea..5f6a305 100644
---- a/net/bluetooth/rfcomm/tty.c
-+++ b/net/bluetooth/rfcomm/tty.c
-@@ -844,10 +844,6 @@ static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsigned
- 		BT_DBG("TIOCMIWAIT");
- 		break;
- 
--	case TIOCGICOUNT:
--		BT_DBG("TIOCGICOUNT");
--		break;
--
- 	case TIOCGSERIAL:
- 		BT_ERR("TIOCGSERIAL is not supported");
- 		return -ENOIOCTLCMD;
-diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index ca520d4..9cc6289 100644
---- a/net/ipv6/udp.c
-+++ b/net/ipv6/udp.c
-@@ -1141,7 +1141,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, int features)
- 	skb->ip_summed = CHECKSUM_NONE;
- 
- 	/* Check if there is enough headroom to insert fragment header. */
--	if ((skb_headroom(skb) < frag_hdr_sz) &&
-+	if ((skb_mac_header(skb) < skb->head + frag_hdr_sz) &&
- 	    pskb_expand_head(skb, frag_hdr_sz, 0, GFP_ATOMIC))
- 		goto out;
- 
-diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
-index 46b2647..adaa02c 100644
---- a/net/sunrpc/auth_unix.c
-+++ b/net/sunrpc/auth_unix.c
-@@ -129,6 +129,9 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
- 	for (i = 0; i < groups ; i++)
- 		if (cred->uc_gids[i] != GROUP_AT(acred->group_info, i))
- 			return 0;
-+	if (groups < NFS_NGROUPS &&
-+	    cred->uc_gids[groups] != NOGROUP)
-+		return 0;
- 	return 1;
- }
- 
-diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
-index c67e73e..92b62a8 100644
---- a/scripts/Kbuild.include
-+++ b/scripts/Kbuild.include
-@@ -118,6 +118,11 @@ cc-option-yn = $(call try-run,\
- cc-option-align = $(subst -functions=0,,\
- 	$(call cc-option,-falign-functions=0,-malign-functions=0))
- 
-+# cc-disable-warning
-+# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
-+cc-disable-warning = $(call try-run,\
-+	$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -xc /dev/null -o "$$TMP",-Wno-$(strip $(1)))
-+
- # cc-version
- # Usage gcc-ver := $(call cc-version)
- cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 2db8b5a..ba44dc0 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -12664,7 +12664,6 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
- 	SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",
- 						ALC268_ACER_ASPIRE_ONE),
- 	SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
--	SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron 910", ALC268_AUTO),
- 	SND_PCI_QUIRK_MASK(0x1028, 0xfff0, 0x02b0,
- 			"Dell Inspiron Mini9/Vostro A90", ALC268_DELL),
- 	/* almost compatible with toshiba but with optional digital outs;
-diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
-index 63bc2ae..6fa3152 100644
---- a/sound/soc/codecs/wm8940.c
-+++ b/sound/soc/codecs/wm8940.c
-@@ -472,6 +472,7 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
- 		ret = snd_soc_write(codec, WM8940_POWER1, pwr_reg);
- 		break;
- 	}
-+	codec->bias_level = level;
- 
- 	return ret;
- }

diff --git a/3.1.3/0000_README b/3.1.3/0000_README
index 55e762b..81ef88b 100644
--- a/3.1.3/0000_README
+++ b/3.1.3/0000_README
@@ -3,10 +3,6 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	1002_linux-3.1.3.patch
-From:	http://www.kernel.org
-Desc:	Linux 3.1.3
-
 Patch:	4420_grsecurity-2.2.2-3.1.3-201111262001.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity

diff --git a/3.1.3/1002_linux-3.1.3.patch b/3.1.3/1002_linux-3.1.3.patch
deleted file mode 100644
index d87ecaf..0000000
--- a/3.1.3/1002_linux-3.1.3.patch
+++ /dev/null
@@ -1,1953 +0,0 @@
-diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
-index 742b610..fed957a 100644
---- a/arch/arm/kernel/head.S
-+++ b/arch/arm/kernel/head.S
-@@ -356,7 +356,7 @@ __secondary_data:
-  *  r13 = *virtual* address to jump to upon completion
-  */
- __enable_mmu:
--#ifdef CONFIG_ALIGNMENT_TRAP
-+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
- 	orr	r0, r0, #CR_A
- #else
- 	bic	r0, r0, #CR_A
-diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
-index 00ff00d..123d72a 100644
---- a/arch/s390/include/asm/kvm_host.h
-+++ b/arch/s390/include/asm/kvm_host.h
-@@ -47,7 +47,7 @@ struct sca_block {
- #define KVM_HPAGE_MASK(x)	(~(KVM_HPAGE_SIZE(x) - 1))
- #define KVM_PAGES_PER_HPAGE(x)	(KVM_HPAGE_SIZE(x) / PAGE_SIZE)
- 
--#define CPUSTAT_HOST       0x80000000
-+#define CPUSTAT_STOPPED    0x80000000
- #define CPUSTAT_WAIT       0x10000000
- #define CPUSTAT_ECALL_PEND 0x08000000
- #define CPUSTAT_STOP_INT   0x04000000
-diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
-index 9e4c841..5a5c084 100644
---- a/arch/s390/kvm/diag.c
-+++ b/arch/s390/kvm/diag.c
-@@ -42,7 +42,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu)
- 		return -EOPNOTSUPP;
- 	}
- 
--	atomic_clear_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
-+	atomic_set_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);
- 	vcpu->run->s390_reset_flags |= KVM_S390_RESET_SUBSYSTEM;
- 	vcpu->run->s390_reset_flags |= KVM_S390_RESET_IPL;
- 	vcpu->run->s390_reset_flags |= KVM_S390_RESET_CPU_INIT;
-diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
-index c7c5189..0243454 100644
---- a/arch/s390/kvm/intercept.c
-+++ b/arch/s390/kvm/intercept.c
-@@ -132,7 +132,6 @@ static int handle_stop(struct kvm_vcpu *vcpu)
- 	int rc = 0;
- 
- 	vcpu->stat.exit_stop_request++;
--	atomic_clear_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
- 	spin_lock_bh(&vcpu->arch.local_int.lock);
- 	if (vcpu->arch.local_int.action_bits & ACTION_STORE_ON_STOP) {
- 		vcpu->arch.local_int.action_bits &= ~ACTION_STORE_ON_STOP;
-@@ -149,6 +148,8 @@ static int handle_stop(struct kvm_vcpu *vcpu)
- 	}
- 
- 	if (vcpu->arch.local_int.action_bits & ACTION_STOP_ON_STOP) {
-+		atomic_set_mask(CPUSTAT_STOPPED,
-+				&vcpu->arch.sie_block->cpuflags);
- 		vcpu->arch.local_int.action_bits &= ~ACTION_STOP_ON_STOP;
- 		VCPU_EVENT(vcpu, 3, "%s", "cpu stopped");
- 		rc = -EOPNOTSUPP;
-diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
-index c9aeb4b..d4bd4c7 100644
---- a/arch/s390/kvm/interrupt.c
-+++ b/arch/s390/kvm/interrupt.c
-@@ -224,6 +224,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu,
- 			offsetof(struct _lowcore, restart_psw), sizeof(psw_t));
- 		if (rc == -EFAULT)
- 			exception = 1;
-+		atomic_clear_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);
- 		break;
- 
- 	case KVM_S390_PROGRAM_INT:
-diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
-index 0cba935..8cdb1bd 100644
---- a/arch/s390/kvm/kvm-s390.c
-+++ b/arch/s390/kvm/kvm-s390.c
-@@ -265,10 +265,12 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
- 	restore_fp_regs(&vcpu->arch.guest_fpregs);
- 	restore_access_regs(vcpu->arch.guest_acrs);
- 	gmap_enable(vcpu->arch.gmap);
-+	atomic_set_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
- }
- 
- void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
- {
-+	atomic_clear_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
- 	gmap_disable(vcpu->arch.gmap);
- 	save_fp_regs(&vcpu->arch.guest_fpregs);
- 	save_access_regs(vcpu->arch.guest_acrs);
-@@ -296,7 +298,9 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu)
- 
- int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
- {
--	atomic_set(&vcpu->arch.sie_block->cpuflags, CPUSTAT_ZARCH | CPUSTAT_SM);
-+	atomic_set(&vcpu->arch.sie_block->cpuflags, CPUSTAT_ZARCH |
-+						    CPUSTAT_SM |
-+						    CPUSTAT_STOPPED);
- 	vcpu->arch.sie_block->ecb   = 6;
- 	vcpu->arch.sie_block->eca   = 0xC1002001U;
- 	vcpu->arch.sie_block->fac   = (int) (long) facilities;
-@@ -421,7 +425,7 @@ static int kvm_arch_vcpu_ioctl_set_initial_psw(struct kvm_vcpu *vcpu, psw_t psw)
- {
- 	int rc = 0;
- 
--	if (atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_RUNNING)
-+	if (!(atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_STOPPED))
- 		rc = -EBUSY;
- 	else {
- 		vcpu->run->psw_mask = psw.mask;
-@@ -494,7 +498,7 @@ rerun_vcpu:
- 	if (vcpu->sigset_active)
- 		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
- 
--	atomic_set_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
-+	atomic_clear_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);
- 
- 	BUG_ON(vcpu->kvm->arch.float_int.local_int[vcpu->vcpu_id] == NULL);
- 
-diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
-index d6a50c1..2a129bf 100644
---- a/arch/s390/kvm/sigp.c
-+++ b/arch/s390/kvm/sigp.c
-@@ -57,8 +57,8 @@ static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr,
- 	spin_lock(&fi->lock);
- 	if (fi->local_int[cpu_addr] == NULL)
- 		rc = 3; /* not operational */
--	else if (atomic_read(fi->local_int[cpu_addr]->cpuflags)
--		 & CPUSTAT_RUNNING) {
-+	else if (!(atomic_read(fi->local_int[cpu_addr]->cpuflags)
-+		  & CPUSTAT_STOPPED)) {
- 		*reg &= 0xffffffff00000000UL;
- 		rc = 1; /* status stored */
- 	} else {
-@@ -212,7 +212,7 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address,
- 
- 	spin_lock_bh(&li->lock);
- 	/* cpu must be in stopped state */
--	if (atomic_read(li->cpuflags) & CPUSTAT_RUNNING) {
-+	if (!(atomic_read(li->cpuflags) & CPUSTAT_STOPPED)) {
- 		rc = 1; /* incorrect state */
- 		*reg &= SIGP_STAT_INCORRECT_STATE;
- 		kfree(inti);
-diff --git a/drivers/base/core.c b/drivers/base/core.c
-index bc8729d..78445f4 100644
---- a/drivers/base/core.c
-+++ b/drivers/base/core.c
-@@ -22,6 +22,7 @@
- #include <linux/kallsyms.h>
- #include <linux/mutex.h>
- #include <linux/async.h>
-+#include <linux/pm_runtime.h>
- 
- #include "base.h"
- #include "power/power.h"
-@@ -1742,6 +1743,8 @@ void device_shutdown(void)
- 		 */
- 		list_del_init(&dev->kobj.entry);
- 		spin_unlock(&devices_kset->list_lock);
-+		/* Disable all device's runtime power management */
-+		pm_runtime_disable(dev);
- 
- 		if (dev->bus && dev->bus->shutdown) {
- 			dev_dbg(dev, "shutdown\n");
-diff --git a/drivers/base/node.c b/drivers/base/node.c
-index 793f796..5693ece 100644
---- a/drivers/base/node.c
-+++ b/drivers/base/node.c
-@@ -127,12 +127,13 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
- 		       nid, K(node_page_state(nid, NR_WRITEBACK)),
- 		       nid, K(node_page_state(nid, NR_FILE_PAGES)),
- 		       nid, K(node_page_state(nid, NR_FILE_MAPPED)),
--		       nid, K(node_page_state(nid, NR_ANON_PAGES)
- #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-+		       nid, K(node_page_state(nid, NR_ANON_PAGES)
- 			+ node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
--			HPAGE_PMD_NR
-+			HPAGE_PMD_NR),
-+#else
-+		       nid, K(node_page_state(nid, NR_ANON_PAGES)),
- #endif
--		       ),
- 		       nid, K(node_page_state(nid, NR_SHMEM)),
- 		       nid, node_page_state(nid, NR_KERNEL_STACK) *
- 				THREAD_SIZE / 1024,
-@@ -143,13 +144,14 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
- 		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +
- 				node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
- 		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),
--		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
- #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-+		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
- 			, nid,
- 			K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
--			HPAGE_PMD_NR)
-+			HPAGE_PMD_NR));
-+#else
-+		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
- #endif
--		       );
- 	n += hugetlb_report_node_meminfo(nid, buf + n);
- 	return n;
- }
-diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index 542453f..90587de 100644
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
-@@ -2554,10 +2554,18 @@
- #define _CURBBASE		0x700c4
- #define _CURBPOS			0x700c8
- 
-+#define _CURBCNTR_IVB		0x71080
-+#define _CURBBASE_IVB		0x71084
-+#define _CURBPOS_IVB		0x71088
-+
- #define CURCNTR(pipe) _PIPE(pipe, _CURACNTR, _CURBCNTR)
- #define CURBASE(pipe) _PIPE(pipe, _CURABASE, _CURBBASE)
- #define CURPOS(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS)
- 
-+#define CURCNTR_IVB(pipe) _PIPE(pipe, _CURACNTR, _CURBCNTR_IVB)
-+#define CURBASE_IVB(pipe) _PIPE(pipe, _CURABASE, _CURBBASE_IVB)
-+#define CURPOS_IVB(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS_IVB)
-+
- /* Display A control */
- #define _DSPACNTR                0x70180
- #define   DISPLAY_PLANE_ENABLE			(1<<31)
-@@ -3167,6 +3175,7 @@
- #define  FDI_LINK_TRAIN_NONE_IVB            (3<<8)
- 
- /* both Tx and Rx */
-+#define  FDI_COMPOSITE_SYNC		(1<<11)
- #define  FDI_LINK_TRAIN_AUTO		(1<<10)
- #define  FDI_SCRAMBLING_ENABLE          (0<<7)
- #define  FDI_SCRAMBLING_DISABLE         (1<<7)
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 04411ad..e1340a2 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -2600,6 +2600,7 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc)
- 	temp |= FDI_LINK_TRAIN_PATTERN_1_IVB;
- 	temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK;
- 	temp |= FDI_LINK_TRAIN_400MV_0DB_SNB_B;
-+	temp |= FDI_COMPOSITE_SYNC;
- 	I915_WRITE(reg, temp | FDI_TX_ENABLE);
- 
- 	reg = FDI_RX_CTL(pipe);
-@@ -2607,6 +2608,7 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc)
- 	temp &= ~FDI_LINK_TRAIN_AUTO;
- 	temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT;
- 	temp |= FDI_LINK_TRAIN_PATTERN_1_CPT;
-+	temp |= FDI_COMPOSITE_SYNC;
- 	I915_WRITE(reg, temp | FDI_RX_ENABLE);
- 
- 	POSTING_READ(reg);
-@@ -5758,6 +5760,31 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base)
- 	I915_WRITE(CURBASE(pipe), base);
- }
- 
-+static void ivb_update_cursor(struct drm_crtc *crtc, u32 base)
-+{
-+	struct drm_device *dev = crtc->dev;
-+	struct drm_i915_private *dev_priv = dev->dev_private;
-+	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-+	int pipe = intel_crtc->pipe;
-+	bool visible = base != 0;
-+
-+	if (intel_crtc->cursor_visible != visible) {
-+		uint32_t cntl = I915_READ(CURCNTR_IVB(pipe));
-+		if (base) {
-+			cntl &= ~CURSOR_MODE;
-+			cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
-+		} else {
-+			cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
-+			cntl |= CURSOR_MODE_DISABLE;
-+		}
-+		I915_WRITE(CURCNTR_IVB(pipe), cntl);
-+
-+		intel_crtc->cursor_visible = visible;
-+	}
-+	/* and commit changes on next vblank */
-+	I915_WRITE(CURBASE_IVB(pipe), base);
-+}
-+
- /* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */
- static void intel_crtc_update_cursor(struct drm_crtc *crtc,
- 				     bool on)
-@@ -5805,11 +5832,16 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
- 	if (!visible && !intel_crtc->cursor_visible)
- 		return;
- 
--	I915_WRITE(CURPOS(pipe), pos);
--	if (IS_845G(dev) || IS_I865G(dev))
--		i845_update_cursor(crtc, base);
--	else
--		i9xx_update_cursor(crtc, base);
-+	if (IS_IVYBRIDGE(dev)) {
-+		I915_WRITE(CURPOS_IVB(pipe), pos);
-+		ivb_update_cursor(crtc, base);
-+	} else {
-+		I915_WRITE(CURPOS(pipe), pos);
-+		if (IS_845G(dev) || IS_I865G(dev))
-+			i845_update_cursor(crtc, base);
-+		else
-+			i9xx_update_cursor(crtc, base);
-+	}
- 
- 	if (visible)
- 		intel_mark_busy(dev, to_intel_framebuffer(crtc->fb)->obj);
-diff --git a/drivers/media/video/saa7164/saa7164-cards.c b/drivers/media/video/saa7164/saa7164-cards.c
-index 69822a4..c713691 100644
---- a/drivers/media/video/saa7164/saa7164-cards.c
-+++ b/drivers/media/video/saa7164/saa7164-cards.c
-@@ -203,6 +203,66 @@ struct saa7164_board saa7164_boards[] = {
- 			.i2c_reg_len	= REGLEN_8bit,
- 		} },
- 	},
-+	[SAA7164_BOARD_HAUPPAUGE_HVR2200_4] = {
-+		.name		= "Hauppauge WinTV-HVR2200",
-+		.porta		= SAA7164_MPEG_DVB,
-+		.portb		= SAA7164_MPEG_DVB,
-+		.portc		= SAA7164_MPEG_ENCODER,
-+		.portd		= SAA7164_MPEG_ENCODER,
-+		.porte		= SAA7164_MPEG_VBI,
-+		.portf		= SAA7164_MPEG_VBI,
-+		.chiprev	= SAA7164_CHIP_REV3,
-+		.unit		= {{
-+			.id		= 0x1d,
-+			.type		= SAA7164_UNIT_EEPROM,
-+			.name		= "4K EEPROM",
-+			.i2c_bus_nr	= SAA7164_I2C_BUS_0,
-+			.i2c_bus_addr	= 0xa0 >> 1,
-+			.i2c_reg_len	= REGLEN_8bit,
-+		}, {
-+			.id		= 0x04,
-+			.type		= SAA7164_UNIT_TUNER,
-+			.name		= "TDA18271-1",
-+			.i2c_bus_nr	= SAA7164_I2C_BUS_1,
-+			.i2c_bus_addr	= 0xc0 >> 1,
-+			.i2c_reg_len	= REGLEN_8bit,
-+		}, {
-+			.id		= 0x05,
-+			.type		= SAA7164_UNIT_ANALOG_DEMODULATOR,
-+			.name		= "TDA8290-1",
-+			.i2c_bus_nr	= SAA7164_I2C_BUS_1,
-+			.i2c_bus_addr	= 0x84 >> 1,
-+			.i2c_reg_len	= REGLEN_8bit,
-+		}, {
-+			.id		= 0x1b,
-+			.type		= SAA7164_UNIT_TUNER,
-+			.name		= "TDA18271-2",
-+			.i2c_bus_nr	= SAA7164_I2C_BUS_2,
-+			.i2c_bus_addr	= 0xc0 >> 1,
-+			.i2c_reg_len	= REGLEN_8bit,
-+		}, {
-+			.id		= 0x1c,
-+			.type		= SAA7164_UNIT_ANALOG_DEMODULATOR,
-+			.name		= "TDA8290-2",
-+			.i2c_bus_nr	= SAA7164_I2C_BUS_2,
-+			.i2c_bus_addr	= 0x84 >> 1,
-+			.i2c_reg_len	= REGLEN_8bit,
-+		}, {
-+			.id		= 0x1e,
-+			.type		= SAA7164_UNIT_DIGITAL_DEMODULATOR,
-+			.name		= "TDA10048-1",
-+			.i2c_bus_nr	= SAA7164_I2C_BUS_1,
-+			.i2c_bus_addr	= 0x10 >> 1,
-+			.i2c_reg_len	= REGLEN_8bit,
-+		}, {
-+			.id		= 0x1f,
-+			.type		= SAA7164_UNIT_DIGITAL_DEMODULATOR,
-+			.name		= "TDA10048-2",
-+			.i2c_bus_nr	= SAA7164_I2C_BUS_2,
-+			.i2c_bus_addr	= 0x12 >> 1,
-+			.i2c_reg_len	= REGLEN_8bit,
-+		} },
-+	},
- 	[SAA7164_BOARD_HAUPPAUGE_HVR2250] = {
- 		.name		= "Hauppauge WinTV-HVR2250",
- 		.porta		= SAA7164_MPEG_DVB,
-@@ -426,6 +486,10 @@ struct saa7164_subid saa7164_subids[] = {
- 		.subvendor = 0x0070,
- 		.subdevice = 0x8851,
- 		.card      = SAA7164_BOARD_HAUPPAUGE_HVR2250_2,
-+	}, {
-+		.subvendor = 0x0070,
-+		.subdevice = 0x8940,
-+		.card      = SAA7164_BOARD_HAUPPAUGE_HVR2200_4,
- 	},
- };
- const unsigned int saa7164_idcount = ARRAY_SIZE(saa7164_subids);
-@@ -469,6 +533,7 @@ void saa7164_gpio_setup(struct saa7164_dev *dev)
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
-+	case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2250:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:
-@@ -549,6 +614,7 @@ void saa7164_card_setup(struct saa7164_dev *dev)
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
-+	case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2250:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2250_2:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2250_3:
-diff --git a/drivers/media/video/saa7164/saa7164-dvb.c b/drivers/media/video/saa7164/saa7164-dvb.c
-index f65eab6..d377937 100644
---- a/drivers/media/video/saa7164/saa7164-dvb.c
-+++ b/drivers/media/video/saa7164/saa7164-dvb.c
-@@ -475,6 +475,7 @@ int saa7164_dvb_register(struct saa7164_port *port)
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
- 	case SAA7164_BOARD_HAUPPAUGE_HVR2200_3:
-+	case SAA7164_BOARD_HAUPPAUGE_HVR2200_4:
- 		i2c_bus = &dev->i2c_bus[port->nr + 1];
- 		switch (port->nr) {
- 		case 0:
-diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h
-index 6678bf1..35b6430 100644
---- a/drivers/media/video/saa7164/saa7164.h
-+++ b/drivers/media/video/saa7164/saa7164.h
-@@ -82,6 +82,7 @@
- #define SAA7164_BOARD_HAUPPAUGE_HVR2200_3	6
- #define SAA7164_BOARD_HAUPPAUGE_HVR2250_2	7
- #define SAA7164_BOARD_HAUPPAUGE_HVR2250_3	8
-+#define SAA7164_BOARD_HAUPPAUGE_HVR2200_4	9
- 
- #define SAA7164_MAX_UNITS		8
- #define SAA7164_TS_NUMBER_OF_LINES	312
-diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index 2d6423c..8563e9a 100644
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -472,7 +472,7 @@ config BMP085
- 	  module will be called bmp085.
- 
- config PCH_PHUB
--	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR IOH(ML7213/ML7223) PHUB"
-+	tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"
- 	depends on PCI
- 	help
- 	  This driver is for PCH(Platform controller Hub) PHUB(Packet Hub) of
-@@ -480,12 +480,13 @@ config PCH_PHUB
- 	  processor. The Topcliff has MAC address and Option ROM data in SROM.
- 	  This driver can access MAC address and Option ROM data in SROM.
- 
--	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
--	  Output Hub), ML7213 and ML7223.
--	  ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
--	  for MP(Media Phone) use.
--	  ML7213/ML7223 is companion chip for Intel Atom E6xx series.
--	  ML7213/ML7223 is completely compatible for Intel EG20T PCH.
-+	  This driver also can be used for LAPIS Semiconductor's IOH,
-+	  ML7213/ML7223/ML7831.
-+	  ML7213 which is for IVI(In-Vehicle Infotainment) use.
-+	  ML7223 IOH is for MP(Media Phone) use.
-+	  ML7831 IOH is for general purpose use.
-+	  ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
-+	  ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
- 
- 	  To compile this driver as a module, choose M here: the module will
- 	  be called pch_phub.
-diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
-index 0fd7e77..ba276ba 100644
---- a/drivers/misc/pch_phub.c
-+++ b/drivers/misc/pch_phub.c
-@@ -73,6 +73,9 @@
- #define PCI_DEVICE_ID_ROHM_ML7223_mPHUB	0x8012 /* for Bus-m */
- #define PCI_DEVICE_ID_ROHM_ML7223_nPHUB	0x8002 /* for Bus-n */
- 
-+/* Macros for ML7831 */
-+#define PCI_DEVICE_ID_ROHM_ML7831_PHUB 0x8801
-+
- /* SROM ACCESS Macro */
- #define PCH_WORD_ADDR_MASK (~((1 << 2) - 1))
- 
-@@ -464,7 +467,7 @@ static int pch_phub_write_gbe_mac_addr(struct pch_phub_reg *chip, u8 *data)
- 	int retval;
- 	int i;
- 
--	if (chip->ioh_type == 1) /* EG20T */
-+	if ((chip->ioh_type == 1) || (chip->ioh_type == 5)) /* EG20T or ML7831*/
- 		retval = pch_phub_gbe_serial_rom_conf(chip);
- 	else	/* ML7223 */
- 		retval = pch_phub_gbe_serial_rom_conf_mp(chip);
-@@ -757,6 +760,22 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev,
- 		chip->pch_opt_rom_start_address =\
- 						 PCH_PHUB_ROM_START_ADDR_ML7223;
- 		chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_ML7223;
-+	} else if (id->driver_data == 5) { /* ML7831 */
-+		retval = sysfs_create_file(&pdev->dev.kobj,
-+					   &dev_attr_pch_mac.attr);
-+		if (retval)
-+			goto err_sysfs_create;
-+
-+		retval = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr);
-+		if (retval)
-+			goto exit_bin_attr;
-+
-+		/* set the prefech value */
-+		iowrite32(0x000affaa, chip->pch_phub_base_address + 0x14);
-+		/* set the interrupt delay value */
-+		iowrite32(0x25, chip->pch_phub_base_address + 0x44);
-+		chip->pch_opt_rom_start_address = PCH_PHUB_ROM_START_ADDR_EG20T;
-+		chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_EG20T;
- 	}
- 
- 	chip->ioh_type = id->driver_data;
-@@ -841,6 +860,7 @@ static struct pci_device_id pch_phub_pcidev_id[] = {
- 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7213_PHUB), 2,  },
- 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7223_mPHUB), 3,  },
- 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7223_nPHUB), 4,  },
-+	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7831_PHUB), 5,  },
- 	{ }
- };
- MODULE_DEVICE_TABLE(pci, pch_phub_pcidev_id);
-diff --git a/drivers/misc/spear13xx_pcie_gadget.c b/drivers/misc/spear13xx_pcie_gadget.c
-index cfbddbe..43d073b 100644
---- a/drivers/misc/spear13xx_pcie_gadget.c
-+++ b/drivers/misc/spear13xx_pcie_gadget.c
-@@ -903,6 +903,6 @@ static void __exit spear_pcie_gadget_exit(void)
- }
- module_exit(spear_pcie_gadget_exit);
- 
--MODULE_ALIAS("pcie-gadget-spear");
-+MODULE_ALIAS("platform:pcie-gadget-spear");
- MODULE_AUTHOR("Pratyush Anand");
- MODULE_LICENSE("GPL");
-diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
-index e0286cf..7be8b05 100644
---- a/drivers/net/wireless/libertas/if_spi.c
-+++ b/drivers/net/wireless/libertas/if_spi.c
-@@ -999,6 +999,7 @@ static int if_spi_host_to_card(struct lbs_private *priv,
- 		spin_unlock_irqrestore(&card->buffer_lock, flags);
- 		break;
- 	default:
-+		kfree(packet);
- 		netdev_err(priv->dev, "can't transfer buffer of type %d\n",
- 			   type);
- 		err = -EINVAL;
-diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
-index f82bfeb..0415e47 100644
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -923,6 +923,7 @@ struct rt2x00_dev {
- 	 * Powersaving work
- 	 */
- 	struct delayed_work autowakeup_work;
-+	struct work_struct sleep_work;
- 
- 	/*
- 	 * Data queue arrays for RX, TX, Beacon and ATIM.
-diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
-index 0955c94..9d05f87 100644
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -449,6 +449,23 @@ static u8 *rt2x00lib_find_ie(u8 *data, unsigned int len, u8 ie)
- 	return NULL;
- }
- 
-+static void rt2x00lib_sleep(struct work_struct *work)
-+{
-+	struct rt2x00_dev *rt2x00dev =
-+	    container_of(work, struct rt2x00_dev, sleep_work);
-+
-+	if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
-+		return;
-+
-+	/*
-+	 * Check again is powersaving is enabled, to prevent races from delayed
-+	 * work execution.
-+	 */
-+	if (!test_bit(CONFIG_POWERSAVING, &rt2x00dev->flags))
-+		rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf,
-+				 IEEE80211_CONF_CHANGE_PS);
-+}
-+
- static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
- 				      struct sk_buff *skb,
- 				      struct rxdone_entry_desc *rxdesc)
-@@ -496,8 +513,7 @@ static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
- 	cam |= (tim_ie->bitmap_ctrl & 0x01);
- 
- 	if (!cam && !test_bit(CONFIG_POWERSAVING, &rt2x00dev->flags))
--		rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf,
--				 IEEE80211_CONF_CHANGE_PS);
-+		queue_work(rt2x00dev->workqueue, &rt2x00dev->sleep_work);
- }
- 
- static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
-@@ -1121,6 +1137,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
- 
- 	INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);
- 	INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
-+	INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
- 
- 	/*
- 	 * Let the driver probe the device to detect the capabilities.
-@@ -1177,6 +1194,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
- 	 */
- 	cancel_work_sync(&rt2x00dev->intf_work);
- 	cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
-+	cancel_work_sync(&rt2x00dev->sleep_work);
- 	if (rt2x00_is_usb(rt2x00dev)) {
- 		del_timer_sync(&rt2x00dev->txstatus_timer);
- 		cancel_work_sync(&rt2x00dev->rxdone_work);
-diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 3382475..c7b6fed 100644
---- a/drivers/scsi/aacraid/linit.c
-+++ b/drivers/scsi/aacraid/linit.c
-@@ -38,6 +38,7 @@
- #include <linux/module.h>
- #include <linux/moduleparam.h>
- #include <linux/pci.h>
-+#include <linux/pci-aspm.h>
- #include <linux/slab.h>
- #include <linux/mutex.h>
- #include <linux/spinlock.h>
-@@ -1108,6 +1109,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
- 		unique_id++;
- 	}
- 
-+	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
-+			       PCIE_LINK_STATE_CLKPM);
-+
- 	error = pci_enable_device(pdev);
- 	if (error)
- 		goto out;
-diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 8c713d3..418ce83 100644
---- a/drivers/scsi/hpsa.c
-+++ b/drivers/scsi/hpsa.c
-@@ -23,6 +23,7 @@
- #include <linux/interrupt.h>
- #include <linux/types.h>
- #include <linux/pci.h>
-+#include <linux/pci-aspm.h>
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/delay.h>
-@@ -3887,6 +3888,10 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
- 		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
- 		return -ENODEV;
- 	}
-+
-+	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
-+			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
-+
- 	err = pci_enable_device(h->pdev);
- 	if (err) {
- 		dev_warn(&h->pdev->dev, "unable to enable PCI device\n");
-diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
-index 72273a0..b3c6d95 100644
---- a/drivers/scsi/scsi_scan.c
-+++ b/drivers/scsi/scsi_scan.c
-@@ -319,11 +319,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
- 	return sdev;
- 
- out_device_destroy:
--	scsi_device_set_state(sdev, SDEV_DEL);
--	transport_destroy_device(&sdev->sdev_gendev);
--	put_device(&sdev->sdev_dev);
--	scsi_free_queue(sdev->request_queue);
--	put_device(&sdev->sdev_gendev);
-+	__scsi_remove_device(sdev);
- out:
- 	if (display_failure_msg)
- 		printk(ALLOC_FAILURE_MSG, __func__);
-diff --git a/drivers/tty/hvc/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
-index 435f6fa..44fbeba 100644
---- a/drivers/tty/hvc/hvc_dcc.c
-+++ b/drivers/tty/hvc/hvc_dcc.c
-@@ -46,6 +46,7 @@ static inline char __dcc_getchar(void)
- 
- 	asm volatile("mrc p14, 0, %0, c0, c5, 0	@ read comms data reg"
- 		: "=r" (__c));
-+	isb();
- 
- 	return __c;
- }
-@@ -55,6 +56,7 @@ static inline void __dcc_putchar(char c)
- 	asm volatile("mcr p14, 0, %0, c0, c5, 0	@ write a char"
- 		: /* no output register */
- 		: "r" (c));
-+	isb();
- }
- 
- static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count)
-diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
-index 4dcb37b..abf6fa4 100644
---- a/drivers/tty/serial/Kconfig
-+++ b/drivers/tty/serial/Kconfig
-@@ -1570,7 +1570,7 @@ config SERIAL_IFX6X60
- 	  Support for the IFX6x60 modem devices on Intel MID platforms.
- 
- config SERIAL_PCH_UART
--	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR IOH(ML7213/ML7223) UART"
-+	tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) UART"
- 	depends on PCI
- 	select SERIAL_CORE
- 	help
-@@ -1578,12 +1578,12 @@ config SERIAL_PCH_UART
- 	  which is an IOH(Input/Output Hub) for x86 embedded processor.
- 	  Enabling PCH_DMA, this PCH UART works as DMA mode.
- 
--	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
--	  Output Hub), ML7213 and ML7223.
--	  ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
--	  for MP(Media Phone) use.
--	  ML7213/ML7223 is companion chip for Intel Atom E6xx series.
--	  ML7213/ML7223 is completely compatible for Intel EG20T PCH.
-+	  This driver also can be used for LAPIS Semiconductor IOH(Input/
-+	  Output Hub), ML7213, ML7223 and ML7831.
-+	  ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is
-+	  for MP(Media Phone) use and ML7831 IOH is for general purpose use.
-+	  ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
-+	  ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
- 
- config SERIAL_MSM_SMD
- 	bool "Enable tty device interface for some SMD ports"
-diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
-index b46218d..f913ed0 100644
---- a/drivers/tty/serial/pch_uart.c
-+++ b/drivers/tty/serial/pch_uart.c
-@@ -256,6 +256,8 @@ enum pch_uart_num_t {
- 	pch_ml7213_uart2,
- 	pch_ml7223_uart0,
- 	pch_ml7223_uart1,
-+	pch_ml7831_uart0,
-+	pch_ml7831_uart1,
- };
- 
- static struct pch_uart_driver_data drv_dat[] = {
-@@ -268,6 +270,8 @@ static struct pch_uart_driver_data drv_dat[] = {
- 	[pch_ml7213_uart2] = {PCH_UART_2LINE, 2},
- 	[pch_ml7223_uart0] = {PCH_UART_8LINE, 0},
- 	[pch_ml7223_uart1] = {PCH_UART_2LINE, 1},
-+	[pch_ml7831_uart0] = {PCH_UART_8LINE, 0},
-+	[pch_ml7831_uart1] = {PCH_UART_2LINE, 1},
- };
- 
- static unsigned int default_baud = 9600;
-@@ -626,6 +630,7 @@ static void pch_request_dma(struct uart_port *port)
- 		dev_err(priv->port.dev, "%s:dma_request_channel FAILS(Rx)\n",
- 			__func__);
- 		dma_release_channel(priv->chan_tx);
-+		priv->chan_tx = NULL;
- 		return;
- 	}
- 
-@@ -1213,8 +1218,7 @@ static void pch_uart_shutdown(struct uart_port *port)
- 		dev_err(priv->port.dev,
- 			"pch_uart_hal_set_fifo Failed(ret=%d)\n", ret);
- 
--	if (priv->use_dma_flag)
--		pch_free_dma(port);
-+	pch_free_dma(port);
- 
- 	free_irq(priv->port.irq, priv);
- }
-@@ -1278,6 +1282,7 @@ static void pch_uart_set_termios(struct uart_port *port,
- 	if (rtn)
- 		goto out;
- 
-+	pch_uart_set_mctrl(&priv->port, priv->port.mctrl);
- 	/* Don't rewrite B0 */
- 	if (tty_termios_baud_rate(termios))
- 		tty_termios_encode_baud_rate(termios, baud, baud);
-@@ -1550,6 +1555,10 @@ static DEFINE_PCI_DEVICE_TABLE(pch_uart_pci_id) = {
- 	 .driver_data = pch_ml7223_uart0},
- 	{PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x800D),
- 	 .driver_data = pch_ml7223_uart1},
-+	{PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8811),
-+	 .driver_data = pch_ml7831_uart0},
-+	{PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8812),
-+	 .driver_data = pch_ml7831_uart1},
- 	{0,},
- };
- 
-diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
-index ef925d5..a76c808 100644
---- a/drivers/tty/tty_ldisc.c
-+++ b/drivers/tty/tty_ldisc.c
-@@ -36,6 +36,7 @@
- 
- #include <linux/kmod.h>
- #include <linux/nsproxy.h>
-+#include <linux/ratelimit.h>
- 
- /*
-  *	This guards the refcounted line discipline lists. The lock
-@@ -548,15 +549,16 @@ static void tty_ldisc_flush_works(struct tty_struct *tty)
- /**
-  *	tty_ldisc_wait_idle	-	wait for the ldisc to become idle
-  *	@tty: tty to wait for
-+ *	@timeout: for how long to wait at most
-  *
-  *	Wait for the line discipline to become idle. The discipline must
-  *	have been halted for this to guarantee it remains idle.
-  */
--static int tty_ldisc_wait_idle(struct tty_struct *tty)
-+static int tty_ldisc_wait_idle(struct tty_struct *tty, long timeout)
- {
--	int ret;
-+	long ret;
- 	ret = wait_event_timeout(tty_ldisc_idle,
--			atomic_read(&tty->ldisc->users) == 1, 5 * HZ);
-+			atomic_read(&tty->ldisc->users) == 1, timeout);
- 	if (ret < 0)
- 		return ret;
- 	return ret > 0 ? 0 : -EBUSY;
-@@ -666,7 +668,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
- 
- 	tty_ldisc_flush_works(tty);
- 
--	retval = tty_ldisc_wait_idle(tty);
-+	retval = tty_ldisc_wait_idle(tty, 5 * HZ);
- 
- 	tty_lock();
- 	mutex_lock(&tty->ldisc_mutex);
-@@ -763,8 +765,6 @@ static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc)
- 	if (IS_ERR(ld))
- 		return -1;
- 
--	WARN_ON_ONCE(tty_ldisc_wait_idle(tty));
--
- 	tty_ldisc_close(tty, tty->ldisc);
- 	tty_ldisc_put(tty->ldisc);
- 	tty->ldisc = NULL;
-@@ -839,7 +839,7 @@ void tty_ldisc_hangup(struct tty_struct *tty)
- 	tty_unlock();
- 	cancel_work_sync(&tty->buf.work);
- 	mutex_unlock(&tty->ldisc_mutex);
--
-+retry:
- 	tty_lock();
- 	mutex_lock(&tty->ldisc_mutex);
- 
-@@ -848,6 +848,22 @@ void tty_ldisc_hangup(struct tty_struct *tty)
- 	   it means auditing a lot of other paths so this is
- 	   a FIXME */
- 	if (tty->ldisc) {	/* Not yet closed */
-+		if (atomic_read(&tty->ldisc->users) != 1) {
-+			char cur_n[TASK_COMM_LEN], tty_n[64];
-+			long timeout = 3 * HZ;
-+			tty_unlock();
-+
-+			while (tty_ldisc_wait_idle(tty, timeout) == -EBUSY) {
-+				timeout = MAX_SCHEDULE_TIMEOUT;
-+				printk_ratelimited(KERN_WARNING
-+					"%s: waiting (%s) for %s took too long, but we keep waiting...\n",
-+					__func__, get_task_comm(cur_n, current),
-+					tty_name(tty, tty_n));
-+			}
-+			mutex_unlock(&tty->ldisc_mutex);
-+			goto retry;
-+		}
-+
- 		if (reset == 0) {
- 
- 			if (!tty_ldisc_reinit(tty, tty->termios->c_line))
-diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
-index 5112f57..2ffcaa0 100644
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -539,7 +539,6 @@ static void acm_port_down(struct acm *acm)
- {
- 	int i;
- 
--	mutex_lock(&open_mutex);
- 	if (acm->dev) {
- 		usb_autopm_get_interface(acm->control);
- 		acm_set_control(acm, acm->ctrlout = 0);
-@@ -551,14 +550,15 @@ static void acm_port_down(struct acm *acm)
- 		acm->control->needs_remote_wakeup = 0;
- 		usb_autopm_put_interface(acm->control);
- 	}
--	mutex_unlock(&open_mutex);
- }
- 
- static void acm_tty_hangup(struct tty_struct *tty)
- {
- 	struct acm *acm = tty->driver_data;
- 	tty_port_hangup(&acm->port);
-+	mutex_lock(&open_mutex);
- 	acm_port_down(acm);
-+	mutex_unlock(&open_mutex);
- }
- 
- static void acm_tty_close(struct tty_struct *tty, struct file *filp)
-@@ -569,8 +569,9 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp)
- 	   shutdown */
- 	if (!acm)
- 		return;
-+
-+	mutex_lock(&open_mutex);
- 	if (tty_port_close_start(&acm->port, tty, filp) == 0) {
--		mutex_lock(&open_mutex);
- 		if (!acm->dev) {
- 			tty_port_tty_set(&acm->port, NULL);
- 			acm_tty_unregister(acm);
-@@ -582,6 +583,7 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp)
- 	acm_port_down(acm);
- 	tty_port_close_end(&acm->port, tty);
- 	tty_port_tty_set(&acm->port, NULL);
-+	mutex_unlock(&open_mutex);
- }
- 
- static int acm_tty_write(struct tty_struct *tty,
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index a428aa0..210e359 100644
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -813,6 +813,12 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
- 					USB_PORT_FEAT_C_PORT_LINK_STATE);
- 		}
- 
-+		if ((portchange & USB_PORT_STAT_C_BH_RESET) &&
-+				hub_is_superspeed(hub->hdev)) {
-+			need_debounce_delay = true;
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_BH_PORT_RESET);
-+		}
- 		/* We can forget about a "removed" device when there's a
- 		 * physical disconnect or the connect status changes.
- 		 */
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index d6a8d82..ecf12e1 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -50,15 +50,42 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	/* Logitech Webcam B/C500 */
- 	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C600 */
-+	{ USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Webcam Pro 9000 */
- 	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C905 */
-+	{ USB_DEVICE(0x046d, 0x080a), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C210 */
-+	{ USB_DEVICE(0x046d, 0x0819), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C260 */
-+	{ USB_DEVICE(0x046d, 0x081a), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Webcam C310 */
- 	{ USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C910 */
-+	{ USB_DEVICE(0x046d, 0x0821), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C160 */
-+	{ USB_DEVICE(0x046d, 0x0824), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Webcam C270 */
- 	{ USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Quickcam Pro 9000 */
-+	{ USB_DEVICE(0x046d, 0x0990), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Quickcam E3500 */
-+	{ USB_DEVICE(0x046d, 0x09a4), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Quickcam Vision Pro */
-+	{ USB_DEVICE(0x046d, 0x09a6), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Harmony 700-series */
- 	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
- 
-diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
-index 5a084b9..6f50491 100644
---- a/drivers/usb/gadget/Kconfig
-+++ b/drivers/usb/gadget/Kconfig
-@@ -442,7 +442,7 @@ config USB_LANGWELL
- 	   gadget drivers to also be dynamically linked.
- 
- config USB_EG20T
--	tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH UDC"
-+	tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
- 	depends on PCI
- 	select USB_GADGET_DUALSPEED
- 	help
-@@ -458,10 +458,11 @@ config USB_EG20T
- 	  This driver dose not support interrupt transfer or isochronous
- 	  transfer modes.
- 
--	  This driver also can be used for OKI SEMICONDUCTOR's ML7213 which is
-+	  This driver also can be used for LAPIS Semiconductor's ML7213 which is
- 	  for IVI(In-Vehicle Infotainment) use.
--	  ML7213 is companion chip for Intel Atom E6xx series.
--	  ML7213 is completely compatible for Intel EG20T PCH.
-+	  ML7831 is for general purpose use.
-+	  ML7213/ML7831 is companion chip for Intel Atom E6xx series.
-+	  ML7213/ML7831 is completely compatible for Intel EG20T PCH.
- 
- config USB_CI13XXX_MSM
- 	tristate "MIPS USB CI13xxx for MSM"
-diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
-index f96615a..06c40b1 100644
---- a/drivers/usb/gadget/pch_udc.c
-+++ b/drivers/usb/gadget/pch_udc.c
-@@ -363,6 +363,7 @@ struct pch_udc_dev {
- #define PCI_DEVICE_ID_INTEL_EG20T_UDC	0x8808
- #define PCI_VENDOR_ID_ROHM		0x10DB
- #define PCI_DEVICE_ID_ML7213_IOH_UDC	0x801D
-+#define PCI_DEVICE_ID_ML7831_IOH_UDC	0x8808
- 
- static const char	ep0_string[] = "ep0in";
- static DEFINE_SPINLOCK(udc_stall_spinlock);	/* stall spin lock */
-@@ -2979,6 +2980,11 @@ static DEFINE_PCI_DEVICE_TABLE(pch_udc_pcidev_id) = {
- 		.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
- 		.class_mask = 0xffffffff,
- 	},
-+	{
-+		PCI_DEVICE(PCI_VENDOR_ID_ROHM, PCI_DEVICE_ID_ML7831_IOH_UDC),
-+		.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
-+		.class_mask = 0xffffffff,
-+	},
- 	{ 0 },
- };
- 
-diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
-index 29bec34..afef3df 100644
---- a/drivers/usb/host/ehci-sched.c
-+++ b/drivers/usb/host/ehci-sched.c
-@@ -1480,10 +1480,15 @@ iso_stream_schedule (
- 
- 		/* NOTE:  assumes URB_ISO_ASAP, to limit complexity/bugs */
- 
--		/* find a uframe slot with enough bandwidth */
--		next = start + period;
--		for (; start < next; start++) {
--
-+		/* find a uframe slot with enough bandwidth.
-+		 * Early uframes are more precious because full-speed
-+		 * iso IN transfers can't use late uframes,
-+		 * and therefore they should be allocated last.
-+		 */
-+		next = start;
-+		start += period;
-+		do {
-+			start--;
- 			/* check schedule: enough space? */
- 			if (stream->highspeed) {
- 				if (itd_slot_ok(ehci, mod, start,
-@@ -1496,7 +1501,7 @@ iso_stream_schedule (
- 						start, sched, period))
- 					break;
- 			}
--		}
-+		} while (start > next);
- 
- 		/* no room in the schedule */
- 		if (start == next) {
-diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
-index 629a968..a495d48 100644
---- a/drivers/usb/host/pci-quirks.c
-+++ b/drivers/usb/host/pci-quirks.c
-@@ -626,7 +626,7 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
- 	void __iomem *base, *op_reg_base;
- 	u32	hcc_params, cap, val;
- 	u8	offset, cap_length;
--	int	wait_time, delta, count = 256/4;
-+	int	wait_time, count = 256/4;
- 
- 	if (!mmio_resource_enabled(pdev, 0))
- 		return;
-@@ -672,11 +672,10 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
- 		writel(val, op_reg_base + EHCI_USBCMD);
- 
- 		wait_time = 2000;
--		delta = 100;
- 		do {
- 			writel(0x3f, op_reg_base + EHCI_USBSTS);
--			udelay(delta);
--			wait_time -= delta;
-+			udelay(100);
-+			wait_time -= 100;
- 			val = readl(op_reg_base + EHCI_USBSTS);
- 			if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED)) {
- 				break;
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 3428528..d718033 100644
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -875,7 +875,6 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud
- 	struct xhci_virt_device *dev;
- 	struct xhci_ep_ctx	*ep0_ctx;
- 	struct xhci_slot_ctx    *slot_ctx;
--	struct xhci_input_control_ctx *ctrl_ctx;
- 	u32			port_num;
- 	struct usb_device *top_dev;
- 
-@@ -887,12 +886,8 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud
- 		return -EINVAL;
- 	}
- 	ep0_ctx = xhci_get_ep_ctx(xhci, dev->in_ctx, 0);
--	ctrl_ctx = xhci_get_input_control_ctx(xhci, dev->in_ctx);
- 	slot_ctx = xhci_get_slot_ctx(xhci, dev->in_ctx);
- 
--	/* 2) New slot context and endpoint 0 context are valid*/
--	ctrl_ctx->add_flags = cpu_to_le32(SLOT_FLAG | EP0_FLAG);
--
- 	/* 3) Only the control endpoint is valid - one endpoint context */
- 	slot_ctx->dev_info |= cpu_to_le32(LAST_CTX(1) | udev->route);
- 	switch (udev->speed) {
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index dd3eb6f..2c07fff 100644
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -816,23 +816,24 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg)
- 	struct xhci_ring *ring;
- 	struct xhci_td *cur_td;
- 	int ret, i, j;
-+	unsigned long flags;
- 
- 	ep = (struct xhci_virt_ep *) arg;
- 	xhci = ep->xhci;
- 
--	spin_lock(&xhci->lock);
-+	spin_lock_irqsave(&xhci->lock, flags);
- 
- 	ep->stop_cmds_pending--;
- 	if (xhci->xhc_state & XHCI_STATE_DYING) {
- 		xhci_dbg(xhci, "Stop EP timer ran, but another timer marked "
- 				"xHCI as DYING, exiting.\n");
--		spin_unlock(&xhci->lock);
-+		spin_unlock_irqrestore(&xhci->lock, flags);
- 		return;
- 	}
- 	if (!(ep->stop_cmds_pending == 0 && (ep->ep_state & EP_HALT_PENDING))) {
- 		xhci_dbg(xhci, "Stop EP timer ran, but no command pending, "
- 				"exiting.\n");
--		spin_unlock(&xhci->lock);
-+		spin_unlock_irqrestore(&xhci->lock, flags);
- 		return;
- 	}
- 
-@@ -844,11 +845,11 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg)
- 	xhci->xhc_state |= XHCI_STATE_DYING;
- 	/* Disable interrupts from the host controller and start halting it */
- 	xhci_quiesce(xhci);
--	spin_unlock(&xhci->lock);
-+	spin_unlock_irqrestore(&xhci->lock, flags);
- 
- 	ret = xhci_halt(xhci);
- 
--	spin_lock(&xhci->lock);
-+	spin_lock_irqsave(&xhci->lock, flags);
- 	if (ret < 0) {
- 		/* This is bad; the host is not responding to commands and it's
- 		 * not allowing itself to be halted.  At least interrupts are
-@@ -896,7 +897,7 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg)
- 			}
- 		}
- 	}
--	spin_unlock(&xhci->lock);
-+	spin_unlock_irqrestore(&xhci->lock, flags);
- 	xhci_dbg(xhci, "Calling usb_hc_died()\n");
- 	usb_hc_died(xhci_to_hcd(xhci)->primary_hcd);
- 	xhci_dbg(xhci, "xHCI host controller is dead.\n");
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 3770004..67900ff 100644
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -749,7 +749,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
- 	u32			command, temp = 0;
- 	struct usb_hcd		*hcd = xhci_to_hcd(xhci);
- 	struct usb_hcd		*secondary_hcd;
--	int			retval;
-+	int			retval = 0;
- 
- 	/* Wait a bit if either of the roothubs need to settle from the
- 	 * transition into bus suspend.
-@@ -759,6 +759,9 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
- 				xhci->bus_state[1].next_statechange))
- 		msleep(100);
- 
-+	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-+	set_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
-+
- 	spin_lock_irq(&xhci->lock);
- 	if (xhci->quirks & XHCI_RESET_ON_RESUME)
- 		hibernated = true;
-@@ -828,20 +831,13 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
- 			return retval;
- 		xhci_dbg(xhci, "Start the primary HCD\n");
- 		retval = xhci_run(hcd->primary_hcd);
--		if (retval)
--			goto failed_restart;
--
--		xhci_dbg(xhci, "Start the secondary HCD\n");
--		retval = xhci_run(secondary_hcd);
- 		if (!retval) {
--			set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
--			set_bit(HCD_FLAG_HW_ACCESSIBLE,
--					&xhci->shared_hcd->flags);
-+			xhci_dbg(xhci, "Start the secondary HCD\n");
-+			retval = xhci_run(secondary_hcd);
- 		}
--failed_restart:
- 		hcd->state = HC_STATE_SUSPENDED;
- 		xhci->shared_hcd->state = HC_STATE_SUSPENDED;
--		return retval;
-+		goto done;
- 	}
- 
- 	/* step 4: set Run/Stop bit */
-@@ -860,11 +856,14 @@ failed_restart:
- 	 * Running endpoints by ringing their doorbells
- 	 */
- 
--	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
--	set_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
--
- 	spin_unlock_irq(&xhci->lock);
--	return 0;
-+
-+ done:
-+	if (retval == 0) {
-+		usb_hcd_resume_root_hub(hcd);
-+		usb_hcd_resume_root_hub(xhci->shared_hcd);
-+	}
-+	return retval;
- }
- #endif	/* CONFIG_PM */
- 
-@@ -2873,6 +2872,10 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
- 	/* Otherwise, update the control endpoint ring enqueue pointer. */
- 	else
- 		xhci_copy_ep0_dequeue_into_input_ctx(xhci, udev);
-+	ctrl_ctx = xhci_get_input_control_ctx(xhci, virt_dev->in_ctx);
-+	ctrl_ctx->add_flags = cpu_to_le32(SLOT_FLAG | EP0_FLAG);
-+	ctrl_ctx->drop_flags = 0;
-+
- 	xhci_dbg(xhci, "Slot ID %d Input Context:\n", udev->slot_id);
- 	xhci_dbg_ctx(xhci, virt_dev->in_ctx, 2);
- 
-@@ -2954,7 +2957,6 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
- 	virt_dev->address = (le32_to_cpu(slot_ctx->dev_state) & DEV_ADDR_MASK)
- 		+ 1;
- 	/* Zero the input context control for later use */
--	ctrl_ctx = xhci_get_input_control_ctx(xhci, virt_dev->in_ctx);
- 	ctrl_ctx->add_flags = 0;
- 	ctrl_ctx->drop_flags = 0;
- 
-diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
-index 5cdb9d9..18e875b 100644
---- a/drivers/usb/serial/ark3116.c
-+++ b/drivers/usb/serial/ark3116.c
-@@ -42,7 +42,7 @@ static int debug;
-  * Version information
-  */
- 
--#define DRIVER_VERSION "v0.6"
-+#define DRIVER_VERSION "v0.7"
- #define DRIVER_AUTHOR "Bart Hartgers <bart.hartgers+ark3116@×××××.com>"
- #define DRIVER_DESC "USB ARK3116 serial/IrDA driver"
- #define DRIVER_DEV_DESC "ARK3116 RS232/IrDA"
-@@ -380,10 +380,6 @@ static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port)
- 		goto err_out;
- 	}
- 
--	/* setup termios */
--	if (tty)
--		ark3116_set_termios(tty, port, NULL);
--
- 	/* remove any data still left: also clears error state */
- 	ark3116_read_reg(serial, UART_RX, buf);
- 
-@@ -406,6 +402,10 @@ static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port)
- 	/* enable DMA */
- 	ark3116_write_reg(port->serial, UART_FCR, UART_FCR_DMA_SELECT);
- 
-+	/* setup termios */
-+	if (tty)
-+		ark3116_set_termios(tty, port, NULL);
-+
- err_out:
- 	kfree(buf);
- 	return result;
-diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
-index f34f6ed..e16394c 100644
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -2083,13 +2083,19 @@ static void ftdi_set_termios(struct tty_struct *tty,
- 
- 	cflag = termios->c_cflag;
- 
--	/* FIXME -For this cut I don't care if the line is really changing or
--	   not  - so just do the change regardless  - should be able to
--	   compare old_termios and tty->termios */
-+	if (old_termios->c_cflag == termios->c_cflag
-+	    && old_termios->c_ispeed == termios->c_ispeed
-+	    && old_termios->c_ospeed == termios->c_ospeed)
-+		goto no_c_cflag_changes;
-+
- 	/* NOTE These routines can get interrupted by
- 	   ftdi_sio_read_bulk_callback  - need to examine what this means -
- 	   don't see any problems yet */
- 
-+	if ((old_termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB)) ==
-+	    (termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB)))
-+		goto no_data_parity_stop_changes;
-+
- 	/* Set number of data bits, parity, stop bits */
- 
- 	urb_value = 0;
-@@ -2130,6 +2136,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
- 	}
- 
- 	/* Now do the baudrate */
-+no_data_parity_stop_changes:
- 	if ((cflag & CBAUD) == B0) {
- 		/* Disable flow control */
- 		if (usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-@@ -2157,6 +2164,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
- 
- 	/* Set flow control */
- 	/* Note device also supports DTR/CD (ugh) and Xon/Xoff in hardware */
-+no_c_cflag_changes:
- 	if (cflag & CRTSCTS) {
- 		dbg("%s Setting to CRTSCTS flow control", __func__);
- 		if (usb_control_msg(dev,
-diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 89ae1f6..3a47cbe 100644
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -156,6 +156,7 @@ static void option_instat_callback(struct urb *urb);
- #define HUAWEI_PRODUCT_K4511			0x14CC
- #define HUAWEI_PRODUCT_ETS1220			0x1803
- #define HUAWEI_PRODUCT_E353			0x1506
-+#define HUAWEI_PRODUCT_E173S			0x1C05
- 
- #define QUANTA_VENDOR_ID			0x0408
- #define QUANTA_PRODUCT_Q101			0xEA02
-@@ -316,6 +317,9 @@ static void option_instat_callback(struct urb *urb);
- #define ZTE_PRODUCT_AC8710			0xfff1
- #define ZTE_PRODUCT_AC2726			0xfff5
- #define ZTE_PRODUCT_AC8710T			0xffff
-+#define ZTE_PRODUCT_MC2718			0xffe8
-+#define ZTE_PRODUCT_AD3812			0xffeb
-+#define ZTE_PRODUCT_MC2716			0xffed
- 
- #define BENQ_VENDOR_ID				0x04a5
- #define BENQ_PRODUCT_H10			0x4068
-@@ -500,6 +504,18 @@ static const struct option_blacklist_info zte_k3765_z_blacklist = {
- 	.reserved = BIT(4),
- };
- 
-+static const struct option_blacklist_info zte_ad3812_z_blacklist = {
-+	.sendsetup = BIT(0) | BIT(1) | BIT(2),
-+};
-+
-+static const struct option_blacklist_info zte_mc2718_z_blacklist = {
-+	.sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4),
-+};
-+
-+static const struct option_blacklist_info zte_mc2716_z_blacklist = {
-+	.sendsetup = BIT(1) | BIT(2) | BIT(3),
-+};
-+
- static const struct option_blacklist_info huawei_cdc12_blacklist = {
- 	.reserved = BIT(1) | BIT(2),
- };
-@@ -622,6 +638,7 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
- 		.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
-@@ -1043,6 +1060,12 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff),
-+	 .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff),
-+	 .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),
-+	 .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },
- 	{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
- 	{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
- 	{ USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */
-diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
-index 614fabc..d44c669 100644
---- a/drivers/usb/serial/pl2303.c
-+++ b/drivers/usb/serial/pl2303.c
-@@ -91,7 +91,6 @@ static const struct usb_device_id id_table[] = {
- 	{ USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
- 	{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
- 	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
--	{ USB_DEVICE(WINCHIPHEAD_VENDOR_ID, WINCHIPHEAD_USBSER_PRODUCT_ID) },
- 	{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
- 	{ }					/* Terminating entry */
- };
-diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
-index 3d10d7f..c38b8c0 100644
---- a/drivers/usb/serial/pl2303.h
-+++ b/drivers/usb/serial/pl2303.h
-@@ -145,10 +145,6 @@
- #define ADLINK_VENDOR_ID		0x0b63
- #define ADLINK_ND6530_PRODUCT_ID	0x6530
- 
--/* WinChipHead USB->RS 232 adapter */
--#define WINCHIPHEAD_VENDOR_ID		0x4348
--#define WINCHIPHEAD_USBSER_PRODUCT_ID	0x5523
--
- /* SMART USB Serial Adapter */
- #define SMART_VENDOR_ID	0x0b8c
- #define SMART_PRODUCT_ID	0x2303
-diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
-index fc310f7..0fded39 100644
---- a/drivers/usb/storage/protocol.c
-+++ b/drivers/usb/storage/protocol.c
-@@ -58,7 +58,9 @@
- 
- void usb_stor_pad12_command(struct scsi_cmnd *srb, struct us_data *us)
- {
--	/* Pad the SCSI command with zeros out to 12 bytes
-+	/*
-+	 * Pad the SCSI command with zeros out to 12 bytes.  If the
-+	 * command already is 12 bytes or longer, leave it alone.
- 	 *
- 	 * NOTE: This only works because a scsi_cmnd struct field contains
- 	 * a unsigned char cmnd[16], so we know we have storage available
-@@ -66,9 +68,6 @@ void usb_stor_pad12_command(struct scsi_cmnd *srb, struct us_data *us)
- 	for (; srb->cmd_len<12; srb->cmd_len++)
- 		srb->cmnd[srb->cmd_len] = 0;
- 
--	/* set command length to 12 bytes */
--	srb->cmd_len = 12;
--
- 	/* send the command to the transport layer */
- 	usb_stor_invoke_transport(srb, us);
- }
-diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
-index b238d95..ac28990 100644
---- a/fs/nfs/dir.c
-+++ b/fs/nfs/dir.c
-@@ -1468,12 +1468,12 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
- 				res = NULL;
- 				goto out;
- 			/* This turned out not to be a regular file */
-+			case -EISDIR:
- 			case -ENOTDIR:
- 				goto no_open;
- 			case -ELOOP:
- 				if (!(nd->intent.open.flags & O_NOFOLLOW))
- 					goto no_open;
--			/* case -EISDIR: */
- 			/* case -EINVAL: */
- 			default:
- 				res = ERR_CAST(inode);
-diff --git a/fs/nfs/file.c b/fs/nfs/file.c
-index 28b8c3f..5b3d984 100644
---- a/fs/nfs/file.c
-+++ b/fs/nfs/file.c
-@@ -895,3 +895,35 @@ static int nfs_setlease(struct file *file, long arg, struct file_lock **fl)
- 			file->f_path.dentry->d_name.name, arg);
- 	return -EINVAL;
- }
-+
-+#ifdef CONFIG_NFS_V4
-+static int
-+nfs4_file_open(struct inode *inode, struct file *filp)
-+{
-+	/*
-+	 * NFSv4 opens are handled in d_lookup and d_revalidate. If we get to
-+	 * this point, then something is very wrong
-+	 */
-+	dprintk("NFS: %s called! inode=%p filp=%p\n", __func__, inode, filp);
-+	return -ENOTDIR;
-+}
-+
-+const struct file_operations nfs4_file_operations = {
-+	.llseek		= nfs_file_llseek,
-+	.read		= do_sync_read,
-+	.write		= do_sync_write,
-+	.aio_read	= nfs_file_read,
-+	.aio_write	= nfs_file_write,
-+	.mmap		= nfs_file_mmap,
-+	.open		= nfs4_file_open,
-+	.flush		= nfs_file_flush,
-+	.release	= nfs_file_release,
-+	.fsync		= nfs_file_fsync,
-+	.lock		= nfs_lock,
-+	.flock		= nfs_flock,
-+	.splice_read	= nfs_file_splice_read,
-+	.splice_write	= nfs_file_splice_write,
-+	.check_flags	= nfs_check_flags,
-+	.setlease	= nfs_setlease,
-+};
-+#endif /* CONFIG_NFS_V4 */
-diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index fe12037..679d2f5 100644
---- a/fs/nfs/inode.c
-+++ b/fs/nfs/inode.c
-@@ -291,7 +291,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
- 		 */
- 		inode->i_op = NFS_SB(sb)->nfs_client->rpc_ops->file_inode_ops;
- 		if (S_ISREG(inode->i_mode)) {
--			inode->i_fop = &nfs_file_operations;
-+			inode->i_fop = NFS_SB(sb)->nfs_client->rpc_ops->file_ops;
- 			inode->i_data.a_ops = &nfs_file_aops;
- 			inode->i_data.backing_dev_info = &NFS_SB(sb)->backing_dev_info;
- 		} else if (S_ISDIR(inode->i_mode)) {
-diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
-index 85f1690..d4bc9ed9 100644
---- a/fs/nfs/nfs3proc.c
-+++ b/fs/nfs/nfs3proc.c
-@@ -853,6 +853,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = {
- 	.dentry_ops	= &nfs_dentry_operations,
- 	.dir_inode_ops	= &nfs3_dir_inode_operations,
- 	.file_inode_ops	= &nfs3_file_inode_operations,
-+	.file_ops	= &nfs_file_operations,
- 	.getroot	= nfs3_proc_get_root,
- 	.getattr	= nfs3_proc_getattr,
- 	.setattr	= nfs3_proc_setattr,
-diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
-index 4700fae..2d8a169 100644
---- a/fs/nfs/nfs4proc.c
-+++ b/fs/nfs/nfs4proc.c
-@@ -6267,6 +6267,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = {
- 	.dentry_ops	= &nfs4_dentry_operations,
- 	.dir_inode_ops	= &nfs4_dir_inode_operations,
- 	.file_inode_ops	= &nfs4_file_inode_operations,
-+	.file_ops	= &nfs4_file_operations,
- 	.getroot	= nfs4_proc_get_root,
- 	.getattr	= nfs4_proc_getattr,
- 	.setattr	= nfs4_proc_setattr,
-diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
-index ac40b85..f48125d 100644
---- a/fs/nfs/proc.c
-+++ b/fs/nfs/proc.c
-@@ -710,6 +710,7 @@ const struct nfs_rpc_ops nfs_v2_clientops = {
- 	.dentry_ops	= &nfs_dentry_operations,
- 	.dir_inode_ops	= &nfs_dir_inode_operations,
- 	.file_inode_ops	= &nfs_file_inode_operations,
-+	.file_ops	= &nfs_file_operations,
- 	.getroot	= nfs_proc_get_root,
- 	.getattr	= nfs_proc_getattr,
- 	.setattr	= nfs_proc_setattr,
-diff --git a/fs/super.c b/fs/super.c
-index 3f56a26..32a81f3 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -61,7 +61,7 @@ static int prune_super(struct shrinker *shrink, struct shrink_control *sc)
- 		return -1;
- 
- 	if (!grab_super_passive(sb))
--		return -1;
-+		return !sc->nr_to_scan ? 0 : -1;
- 
- 	if (sb->s_op && sb->s_op->nr_cached_objects)
- 		fs_objects = sb->s_op->nr_cached_objects(sb);
-diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
-index eaac770..fc0fd15 100644
---- a/include/linux/nfs_fs.h
-+++ b/include/linux/nfs_fs.h
-@@ -410,6 +410,9 @@ extern const struct inode_operations nfs_file_inode_operations;
- extern const struct inode_operations nfs3_file_inode_operations;
- #endif /* CONFIG_NFS_V3 */
- extern const struct file_operations nfs_file_operations;
-+#ifdef CONFIG_NFS_V4
-+extern const struct file_operations nfs4_file_operations;
-+#endif /* CONFIG_NFS_V4 */
- extern const struct address_space_operations nfs_file_aops;
- extern const struct address_space_operations nfs_dir_aops;
- 
-diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
-index abd615d..8475f34 100644
---- a/include/linux/nfs_xdr.h
-+++ b/include/linux/nfs_xdr.h
-@@ -1194,6 +1194,7 @@ struct nfs_rpc_ops {
- 	const struct dentry_operations *dentry_ops;
- 	const struct inode_operations *dir_inode_ops;
- 	const struct inode_operations *file_inode_ops;
-+	const struct file_operations *file_ops;
- 
- 	int	(*getroot) (struct nfs_server *, struct nfs_fh *,
- 			    struct nfs_fsinfo *);
-diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h
-index 790651b..a83833a 100644
---- a/include/linux/shrinker.h
-+++ b/include/linux/shrinker.h
-@@ -20,6 +20,7 @@ struct shrink_control {
-  * 'nr_to_scan' entries and attempt to free them up.  It should return
-  * the number of objects which remain in the cache.  If it returns -1, it means
-  * it cannot do any scanning at this time (eg. there is a risk of deadlock).
-+ * The callback must not return -1 if nr_to_scan is zero.
-  *
-  * The 'gfpmask' refers to the allocation we are currently trying to
-  * fulfil.
-diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
-index aa57d5d..b5f4742 100644
---- a/kernel/irq/spurious.c
-+++ b/kernel/irq/spurious.c
-@@ -115,7 +115,7 @@ static int misrouted_irq(int irq)
- 	struct irq_desc *desc;
- 	int i, ok = 0;
- 
--	if (atomic_inc_return(&irq_poll_active) == 1)
-+	if (atomic_inc_return(&irq_poll_active) != 1)
- 		goto out;
- 
- 	irq_poll_cpu = smp_processor_id();
-diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
-index fb6931d..d58fd8b 100644
---- a/net/batman-adv/translation-table.c
-+++ b/net/batman-adv/translation-table.c
-@@ -137,10 +137,22 @@ static void tt_local_entry_free_ref(struct tt_local_entry *tt_local_entry)
- 		kfree_rcu(tt_local_entry, rcu);
- }
- 
-+static void tt_global_entry_free_rcu(struct rcu_head *rcu)
-+{
-+	struct tt_global_entry *tt_global_entry;
-+
-+	tt_global_entry = container_of(rcu, struct tt_global_entry, rcu);
-+
-+	if (tt_global_entry->orig_node)
-+		orig_node_free_ref(tt_global_entry->orig_node);
-+
-+	kfree(tt_global_entry);
-+}
-+
- static void tt_global_entry_free_ref(struct tt_global_entry *tt_global_entry)
- {
- 	if (atomic_dec_and_test(&tt_global_entry->refcount))
--		kfree_rcu(tt_global_entry, rcu);
-+		call_rcu(&tt_global_entry->rcu, tt_global_entry_free_rcu);
- }
- 
- static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr,
-@@ -686,6 +698,9 @@ void tt_global_del_orig(struct bat_priv *bat_priv,
- 	struct hlist_head *head;
- 	spinlock_t *list_lock; /* protects write access to the hash lists */
- 
-+	if (!hash)
-+		return;
-+
- 	for (i = 0; i < hash->size; i++) {
- 		head = &hash->table[i];
- 		list_lock = &hash->list_locks[i];
-@@ -999,7 +1014,6 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
- 	tt_response = (struct tt_query_packet *)skb_put(skb,
- 						     tt_query_size + tt_len);
- 	tt_response->ttvn = ttvn;
--	tt_response->tt_data = htons(tt_tot);
- 
- 	tt_change = (struct tt_change *)(skb->data + tt_query_size);
- 	tt_count = 0;
-@@ -1025,6 +1039,10 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
- 	}
- 	rcu_read_unlock();
- 
-+	/* store in the message the number of entries we have successfully
-+	 * copied */
-+	tt_response->tt_data = htons(tt_count);
-+
- out:
- 	return skb;
- }
-@@ -1668,6 +1686,8 @@ static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags)
- 		rcu_read_lock();
- 		hlist_for_each_entry_rcu(tt_local_entry, node,
- 					 head, hash_entry) {
-+			if (!(tt_local_entry->flags & flags))
-+				continue;
- 			tt_local_entry->flags &= ~flags;
- 			atomic_inc(&bat_priv->num_local_tt);
- 		}
-diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index 25bd1db..51a0db7 100644
---- a/net/batman-adv/types.h
-+++ b/net/batman-adv/types.h
-@@ -223,22 +223,22 @@ struct socket_packet {
- 
- struct tt_local_entry {
- 	uint8_t addr[ETH_ALEN];
-+	struct hlist_node hash_entry;
- 	unsigned long last_seen;
- 	uint16_t flags;
- 	atomic_t refcount;
- 	struct rcu_head rcu;
--	struct hlist_node hash_entry;
- };
- 
- struct tt_global_entry {
- 	uint8_t addr[ETH_ALEN];
-+	struct hlist_node hash_entry; /* entry in the global table */
- 	struct orig_node *orig_node;
- 	uint8_t ttvn;
- 	uint16_t flags; /* only TT_GLOBAL_ROAM is used */
- 	unsigned long roam_at; /* time at which TT_GLOBAL_ROAM was set */
- 	atomic_t refcount;
- 	struct rcu_head rcu;
--	struct hlist_node hash_entry; /* entry in the global table */
- };
- 
- struct tt_change_node {
-diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 0bc9888..4e6922f 100644
---- a/net/ipv6/ip6_tunnel.c
-+++ b/net/ipv6/ip6_tunnel.c
-@@ -289,6 +289,8 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct ip6_tnl_parm *p)
- 	if ((err = register_netdevice(dev)) < 0)
- 		goto failed_free;
- 
-+	strcpy(t->parms.name, dev->name);
-+
- 	dev_hold(dev);
- 	ip6_tnl_link(ip6n, t);
- 	return t;
-@@ -1397,7 +1399,6 @@ ip6_tnl_dev_init_gen(struct net_device *dev)
- 	struct ip6_tnl *t = netdev_priv(dev);
- 
- 	t->dev = dev;
--	strcpy(t->parms.name, dev->name);
- 	dev->tstats = alloc_percpu(struct pcpu_tstats);
- 	if (!dev->tstats)
- 		return -ENOMEM;
-@@ -1477,6 +1478,7 @@ static void __net_exit ip6_tnl_destroy_tunnels(struct ip6_tnl_net *ip6n)
- static int __net_init ip6_tnl_init_net(struct net *net)
- {
- 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
-+	struct ip6_tnl *t = NULL;
- 	int err;
- 
- 	ip6n->tnls[0] = ip6n->tnls_wc;
-@@ -1497,6 +1499,10 @@ static int __net_init ip6_tnl_init_net(struct net *net)
- 	err = register_netdev(ip6n->fb_tnl_dev);
- 	if (err < 0)
- 		goto err_register;
-+
-+	t = netdev_priv(ip6n->fb_tnl_dev);
-+
-+	strcpy(t->parms.name, ip6n->fb_tnl_dev->name);
- 	return 0;
- 
- err_register:
-diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index fe2c2a7..a961003 100644
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -140,8 +140,9 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
- 	pos++;
- 
- 	/* IEEE80211_RADIOTAP_RATE */
--	if (status->flag & RX_FLAG_HT) {
-+	if (!rate || status->flag & RX_FLAG_HT) {
- 		/*
-+		 * Without rate information don't add it. If we have,
- 		 * MCS information is a separate field in radiotap,
- 		 * added below. The byte here is needed as padding
- 		 * for the channel though, so initialise it to 0.
-@@ -162,12 +163,14 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
- 	else if (status->flag & RX_FLAG_HT)
- 		put_unaligned_le16(IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ,
- 				   pos);
--	else if (rate->flags & IEEE80211_RATE_ERP_G)
-+	else if (rate && rate->flags & IEEE80211_RATE_ERP_G)
- 		put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ,
- 				   pos);
--	else
-+	else if (rate)
- 		put_unaligned_le16(IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ,
- 				   pos);
-+	else
-+		put_unaligned_le16(IEEE80211_CHAN_2GHZ, pos);
- 	pos += 2;
- 
- 	/* IEEE80211_RADIOTAP_DBM_ANTSIGNAL */
-diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index ddeb1b9..fd031e8 100644
---- a/net/mac80211/util.c
-+++ b/net/mac80211/util.c
-@@ -1055,6 +1055,8 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
- 	skb = ieee80211_probereq_get(&local->hw, &sdata->vif,
- 				     ssid, ssid_len,
- 				     buf, buf_len);
-+	if (!skb)
-+		goto out;
- 
- 	if (dst) {
- 		mgmt = (struct ieee80211_mgmt *) skb->data;
-@@ -1063,6 +1065,8 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
- 	}
- 
- 	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
-+
-+ out:
- 	kfree(buf);
- 
- 	return skb;
-diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index ea40d54..1308050 100644
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -126,8 +126,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
- 	[NL80211_ATTR_MESH_CONFIG] = { .type = NLA_NESTED },
- 	[NL80211_ATTR_SUPPORT_MESH_AUTH] = { .type = NLA_FLAG },
- 
--	[NL80211_ATTR_HT_CAPABILITY] = { .type = NLA_BINARY,
--					 .len = NL80211_HT_CAPABILITY_LEN },
-+	[NL80211_ATTR_HT_CAPABILITY] = { .len = NL80211_HT_CAPABILITY_LEN },
- 
- 	[NL80211_ATTR_MGMT_SUBTYPE] = { .type = NLA_U8 },
- 	[NL80211_ATTR_IE] = { .type = NLA_BINARY,
-diff --git a/net/wireless/reg.c b/net/wireless/reg.c
-index 68a471b..1658eff 100644
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -2254,6 +2254,9 @@ void /* __init_or_exit */ regulatory_exit(void)
- 
- 	kfree(last_request);
- 
-+	last_request = NULL;
-+	dev_set_uevent_suppress(&reg_pdev->dev, true);
-+
- 	platform_device_unregister(reg_pdev);
- 
- 	spin_lock_bh(&reg_pending_beacons_lock);
-diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
-index c34f730..44f199c 100644
---- a/sound/pci/hda/hda_eld.c
-+++ b/sound/pci/hda/hda_eld.c
-@@ -297,10 +297,10 @@ static int hdmi_update_eld(struct hdmi_eld *e,
- 					buf + ELD_FIXED_BYTES + mnl + 3 * i);
- 	}
- 
-+	e->eld_valid = true;
- 	return 0;
- 
- out_fail:
--	e->eld_ver = 0;
- 	return -EINVAL;
- }
- 
-@@ -318,9 +318,6 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
- 	int size;
- 	unsigned char *buf;
- 
--	if (!eld->eld_valid)
--		return -ENOENT;
--
- 	size = snd_hdmi_get_eld_size(codec, nid);
- 	if (size == 0) {
- 		/* wfg: workaround for ASUS P5E-VM HDMI board */
-diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
-index c45f3e6..4346ad2 100644
---- a/sound/pci/hda/patch_cirrus.c
-+++ b/sound/pci/hda/patch_cirrus.c
-@@ -236,6 +236,15 @@ static int cs_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
- 	return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
- }
- 
-+static void cs_update_input_select(struct hda_codec *codec)
-+{
-+	struct cs_spec *spec = codec->spec;
-+	if (spec->cur_adc)
-+		snd_hda_codec_write(codec, spec->cur_adc, 0,
-+				    AC_VERB_SET_CONNECT_SEL,
-+				    spec->adc_idx[spec->cur_input]);
-+}
-+
- /*
-  * Analog capture
-  */
-@@ -249,6 +258,7 @@ static int cs_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
- 	spec->cur_adc = spec->adc_nid[spec->cur_input];
- 	spec->cur_adc_stream_tag = stream_tag;
- 	spec->cur_adc_format = format;
-+	cs_update_input_select(codec);
- 	snd_hda_codec_setup_stream(codec, spec->cur_adc, stream_tag, 0, format);
- 	return 0;
- }
-@@ -688,10 +698,8 @@ static int change_cur_input(struct hda_codec *codec, unsigned int idx,
- 					   spec->cur_adc_stream_tag, 0,
- 					   spec->cur_adc_format);
- 	}
--	snd_hda_codec_write(codec, spec->cur_adc, 0,
--			    AC_VERB_SET_CONNECT_SEL,
--			    spec->adc_idx[idx]);
- 	spec->cur_input = idx;
-+	cs_update_input_select(codec);
- 	return 1;
- }
- 
-@@ -972,10 +980,7 @@ static void cs_automic(struct hda_codec *codec)
- 		} else  {
- 			spec->cur_input = spec->last_input;
- 		}
--
--		snd_hda_codec_write_cache(codec, spec->cur_adc, 0,
--					AC_VERB_SET_CONNECT_SEL,
--					spec->adc_idx[spec->cur_input]);
-+		cs_update_input_select(codec);
- 	} else {
- 		if (present)
- 			change_cur_input(codec, spec->automic_idx, 0);
-@@ -1072,9 +1077,7 @@ static void init_input(struct hda_codec *codec)
- 			cs_automic(codec);
- 		else  {
- 			spec->cur_adc = spec->adc_nid[spec->cur_input];
--			snd_hda_codec_write(codec, spec->cur_adc, 0,
--					AC_VERB_SET_CONNECT_SEL,
--					spec->adc_idx[spec->cur_input]);
-+			cs_update_input_select(codec);
- 		}
- 	} else {
- 		change_cur_input(codec, spec->cur_input, 1);
-diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
-index 19cb72d..e287015 100644
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -920,20 +920,23 @@ static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,
- 	 * the unsolicited response to avoid custom WARs.
- 	 */
- 	int present = snd_hda_pin_sense(codec, pin_nid);
-+	bool eld_valid = false;
- 
--	memset(eld, 0, sizeof(*eld));
-+#ifdef CONFIG_PROC_FS
-+	memset(eld, 0, offsetof(struct hdmi_eld, proc_entry));
-+#else
-+	memset(eld, 0, sizeof(struct hdmi_eld));
-+#endif
- 
- 	eld->monitor_present	= !!(present & AC_PINSENSE_PRESENCE);
- 	if (eld->monitor_present)
--		eld->eld_valid	= !!(present & AC_PINSENSE_ELDV);
--	else
--		eld->eld_valid	= 0;
-+		eld_valid	= !!(present & AC_PINSENSE_ELDV);
- 
- 	printk(KERN_INFO
- 		"HDMI status: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n",
--		codec->addr, pin_nid, eld->monitor_present, eld->eld_valid);
-+		codec->addr, pin_nid, eld->monitor_present, eld_valid);
- 
--	if (eld->eld_valid)
-+	if (eld_valid)
- 		if (!snd_hdmi_get_eld(eld, codec, pin_nid))
- 			snd_hdmi_show_eld(eld);
-