2.6.20 updatev2.6.20

11 files changed, 36 insertions, 32 deletions

diff --git a/driver-class/block-device.patch b/driver-class/block-device.patch
index 1df492c1e9c935..8b61fa5c70286f 100644
--- a/driver-class/block-device.patch
+++ b/driver-class/block-device.patch
@@ -907,7 +907,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/fs/block_dev.c
 +++ gregkh-2.6/fs/block_dev.c
-@@ -688,9 +688,9 @@ EXPORT_SYMBOL(bd_release);
+@@ -729,9 +729,9 @@ EXPORT_SYMBOL(bd_release);
  static struct kobject *bdev_get_kobj(struct block_device *bdev)
  {
  	if (bdev->bd_contains != bdev)
@@ -919,7 +919,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static struct kobject *bdev_get_holder(struct block_device *bdev)
-@@ -1116,7 +1116,7 @@ static int do_open(struct block_device *
+@@ -1157,7 +1157,7 @@ static int do_open(struct block_device *
  				ret = -ENXIO;
  				goto out_first;
  			}
@@ -928,7 +928,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			bdev->bd_part = p;
  			bd_set_size(bdev, (loff_t) p->nr_sects << 9);
  		}
-@@ -1239,7 +1239,7 @@ static int __blkdev_put(struct block_dev
+@@ -1280,7 +1280,7 @@ static int __blkdev_put(struct block_dev
  		module_put(owner);
  
  		if (bdev->bd_contains != bdev) {
diff --git a/driver/network-device.patch b/driver/network-device.patch
index 4146ff90b2b14a..f7289c20d418f4 100644
--- a/driver/network-device.patch
+++ b/driver/network-device.patch
@@ -987,7 +987,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		       "%s: sysfs mii attribute registration failed: %d\n",
 --- gregkh-2.6.orig/drivers/net/smc911x.c
 +++ gregkh-2.6/drivers/net/smc911x.c
-@@ -1658,7 +1658,7 @@ smc911x_ethtool_getdrvinfo(struct net_de
+@@ -1659,7 +1659,7 @@ smc911x_ethtool_getdrvinfo(struct net_de
  {
  	strncpy(info->driver, CARDNAME, sizeof(info->driver));
  	strncpy(info->version, version, sizeof(info->version));
diff --git a/gregkh/sysrq-u-laptop.patch b/gregkh/sysrq-u-laptop.patch
index 189e9ddaf674bb..ef13ad35d4ff17 100644
--- a/gregkh/sysrq-u-laptop.patch
+++ b/gregkh/sysrq-u-laptop.patch
@@ -12,10 +12,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/char/sysrq.c
 +++ gregkh-2.6/drivers/char/sysrq.c
-@@ -344,7 +344,7 @@ static struct sysrq_key_op *sysrq_key_ta
- 	NULL,				/* v */
- 	NULL,				/* w */
- 	&sysrq_showstate_blocked_op,	/* x */
+@@ -346,7 +346,7 @@ static struct sysrq_key_op *sysrq_key_ta
+ 	&sysrq_showstate_blocked_op,	/* w */
+ 	/* x: May be registered on ppc/powerpc for xmon */
+ 	NULL,				/* x */
 -	NULL,				/* y */
 +	&sysrq_mountro_op,		/* y stupid fujitsu laptop, can't hit the U key */
  	NULL				/* z */
diff --git a/pci/msi-replace-pci_msi_quirk-with-calls-to-pci_no_msi.patch b/pci/msi-replace-pci_msi_quirk-with-calls-to-pci_no_msi.patch
index 860e1115ad45c9..65c7802d7baea9 100644
--- a/pci/msi-replace-pci_msi_quirk-with-calls-to-pci_no_msi.patch
+++ b/pci/msi-replace-pci_msi_quirk-with-calls-to-pci_no_msi.patch
@@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/net/bnx2.c
 +++ gregkh-2.6/drivers/net/bnx2.c
-@@ -5944,8 +5944,7 @@ bnx2_init_board(struct pci_dev *pdev, st
+@@ -5954,8 +5954,7 @@ bnx2_init_board(struct pci_dev *pdev, st
  	 * responding after a while.
  	 *
  	 * AMD believes this incompatibility is unique to the 5706, and
@@ -73,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  void pci_no_msi(void);
 --- gregkh-2.6.orig/drivers/pci/quirks.c
 +++ gregkh-2.6/drivers/pci/quirks.c
-@@ -1698,9 +1698,6 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_N
+@@ -1700,9 +1700,6 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_N
  			quirk_nvidia_ck804_pcie_aer_ext_cap);
  
  #ifdef CONFIG_PCI_MSI
@@ -83,7 +83,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /* The Serverworks PCI-X chipset does not support MSI. We cannot easily rely
   * on setting PCI_BUS_FLAGS_NO_MSI in its bus flags because there are actually
   * some other busses controlled by the chipset even if Linux is not aware of it.
-@@ -1709,8 +1706,8 @@ int pci_msi_quirk;
+@@ -1711,8 +1708,8 @@ int pci_msi_quirk;
   */
  static void __init quirk_svw_msi(struct pci_dev *dev)
  {
diff --git a/pci/pci-quirk-1k-i-o-space-iobl_adr-fix-on-p64h2.patch b/pci/pci-quirk-1k-i-o-space-iobl_adr-fix-on-p64h2.patch
index 9aec8e4ead9f31..67e769a50904e2 100644
--- a/pci/pci-quirk-1k-i-o-space-iobl_adr-fix-on-p64h2.patch
+++ b/pci/pci-quirk-1k-i-o-space-iobl_adr-fix-on-p64h2.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/pci/quirks.c
 +++ gregkh-2.6/drivers/pci/quirks.c
-@@ -1668,6 +1668,31 @@ static void __devinit quirk_p64h2_1k_io(
+@@ -1670,6 +1670,31 @@ static void __devinit quirk_p64h2_1k_io(
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	0x1460,		quirk_p64h2_1k_io);
  
diff --git a/pci/pci-quirks.c-cleanup.patch b/pci/pci-quirks.c-cleanup.patch
index 94906d22ba9ea5..f73f0e9737d735 100644
--- a/pci/pci-quirks.c-cleanup.patch
+++ b/pci/pci-quirks.c-cleanup.patch
@@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_8151_0,	quirk_nopciamd );
  
  /*
-@@ -1134,6 +1135,14 @@ static void quirk_sis_96x_smbus(struct p
+@@ -1136,6 +1137,14 @@ static void quirk_sis_96x_smbus(struct p
  		pci_write_config_byte(dev, 0x77, val & ~0x10);
  	}
  }
@@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  /*
   * ... This is further complicated by the fact that some SiS96x south
-@@ -1171,6 +1180,8 @@ static void quirk_sis_503(struct pci_dev
+@@ -1173,6 +1182,8 @@ static void quirk_sis_503(struct pci_dev
  	dev->device = devid;
  	quirk_sis_96x_smbus(dev);
  }
@@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  static void __init quirk_sis_96x_compatible(struct pci_dev *dev)
  {
-@@ -1183,8 +1194,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S
+@@ -1185,8 +1196,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_651,		quirk_sis_96x_compatible );
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_735,		quirk_sis_96x_compatible );
  
@@ -105,7 +105,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /*
   * On ASUS A8V and A8V Deluxe boards, the onboard AC97 audio controller
   * and MC97 modem controller are disabled when a second PCI soundcard is
-@@ -1215,21 +1224,8 @@ static void asus_hides_ac97_lpc(struct p
+@@ -1217,21 +1226,8 @@ static void asus_hides_ac97_lpc(struct p
  	}
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8237, asus_hides_ac97_lpc );
@@ -127,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)
  
  /*
-@@ -1274,7 +1270,6 @@ static void quirk_jmicron_dualfn(struct 
+@@ -1276,7 +1272,6 @@ static void quirk_jmicron_dualfn(struct 
  			break;
  	}
  }
@@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);
  DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);
  
-@@ -1418,6 +1413,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -1420,6 +1415,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
  
  
  int pcie_mch_quirk;
@@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  static void __devinit quirk_pcie_mch(struct pci_dev *pdev)
  {
-@@ -1644,6 +1640,7 @@ void pci_fixup_device(enum pci_fixup_pas
+@@ -1646,6 +1642,7 @@ void pci_fixup_device(enum pci_fixup_pas
  	}
  	pci_do_fixups(dev, start, end);
  }
@@ -151,7 +151,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
-@@ -1786,8 +1783,3 @@ static void __devinit quirk_nvidia_ck804
+@@ -1788,8 +1785,3 @@ static void __devinit quirk_nvidia_ck804
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
  			quirk_nvidia_ck804_msi_ht_cap);
  #endif /* CONFIG_PCI_MSI */
diff --git a/pci/pci-remove-pci_find_device_reverse.patch b/pci/pci-remove-pci_find_device_reverse.patch
index 9f44bb08848f62..72be5935a80c79 100644
--- a/pci/pci-remove-pci_find_device_reverse.patch
+++ b/pci/pci-remove-pci_find_device_reverse.patch
@@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/pci/search.c
 +++ gregkh-2.6/drivers/pci/search.c
-@@ -364,43 +364,6 @@ exit:
+@@ -358,43 +358,6 @@ exit:
  }
  
  /**
@@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   * pci_get_class - begin or continue searching for a PCI device by class
   * @class: search for a PCI device with this class designation
   * @from: Previous PCI device found in search, or %NULL for new search.
-@@ -475,7 +438,6 @@ EXPORT_SYMBOL(pci_dev_present);
+@@ -469,7 +432,6 @@ EXPORT_SYMBOL(pci_dev_present);
  EXPORT_SYMBOL(pci_find_present);
  
  EXPORT_SYMBOL(pci_find_device);
diff --git a/pci/pci-remove-quirk_sis_96x_compatible.patch b/pci/pci-remove-quirk_sis_96x_compatible.patch
index 6889778b0bc6f9..aa1b1ce99144dd 100644
--- a/pci/pci-remove-quirk_sis_96x_compatible.patch
+++ b/pci/pci-remove-quirk_sis_96x_compatible.patch
@@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/pci/quirks.c
 +++ gregkh-2.6/drivers/pci/quirks.c
-@@ -1150,8 +1150,6 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_S
+@@ -1152,8 +1152,6 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_S
   *
   * We can also enable the sis96x bit in the discovery register..
   */
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define SIS_DETECT_REGISTER 0x40
  
  static void quirk_sis_503(struct pci_dev *dev)
-@@ -1167,9 +1165,6 @@ static void quirk_sis_503(struct pci_dev
+@@ -1169,9 +1167,6 @@ static void quirk_sis_503(struct pci_dev
  		return;
  	}
  
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	/*
  	 * Ok, it now shows up as a 96x.. run the 96x quirk by
  	 * hand in case it has already been processed.
-@@ -1181,16 +1176,6 @@ static void quirk_sis_503(struct pci_dev
+@@ -1183,16 +1178,6 @@ static void quirk_sis_503(struct pci_dev
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_503,		quirk_sis_503 );
  DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_503,		quirk_sis_503 );
  
diff --git a/pci/pci-speed-up-the-intel-smbus-unhiding-quirk.patch b/pci/pci-speed-up-the-intel-smbus-unhiding-quirk.patch
index b93177a355c1bb..25af8bfacc528a 100644
--- a/pci/pci-speed-up-the-intel-smbus-unhiding-quirk.patch
+++ b/pci/pci-speed-up-the-intel-smbus-unhiding-quirk.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/pci/quirks.c
 +++ gregkh-2.6/drivers/pci/quirks.c
-@@ -975,52 +975,51 @@ static void __init asus_hides_smbus_host
+@@ -977,52 +977,51 @@ static void __init asus_hides_smbus_host
  			case 0x1626: /* L3C notebook */
  				asus_hides_smbus = 1;
  			}
@@ -82,7 +82,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	} else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_HP)) {
  		if (dev->device ==  PCI_DEVICE_ID_INTEL_82855PM_HB)
  			switch(dev->subsystem_device) {
-@@ -1028,25 +1027,24 @@ static void __init asus_hides_smbus_host
+@@ -1030,25 +1029,24 @@ static void __init asus_hides_smbus_host
  			case 0x0890: /* HP Compaq nc6000 */
  				asus_hides_smbus = 1;
  			}
diff --git a/usb/fix-for-bugzilla-7544.patch b/usb/fix-for-bugzilla-7544.patch
index 8d79fb3983f8d8..a400fc4a00c25f 100644
--- a/usb/fix-for-bugzilla-7544.patch
+++ b/usb/fix-for-bugzilla-7544.patch
@@ -28,8 +28,8 @@ Signed-off-by: Rainer Weikusat <rweikusat@sncag.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
- drivers/usb/serial/keyspan.c |   45 +++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 41 insertions(+), 4 deletions(-)
+ drivers/usb/serial/keyspan.c |   49 +++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 45 insertions(+), 4 deletions(-)
 
 --- gregkh-2.6.orig/drivers/usb/serial/keyspan.c
 +++ gregkh-2.6/drivers/usb/serial/keyspan.c
@@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	if (endpoint == -1)
  		return NULL;		/* endpoint not needed */
-@@ -1291,11 +1311,28 @@ static struct urb *keyspan_setup_urb (st
+@@ -1291,11 +1311,32 @@ static struct urb *keyspan_setup_urb (st
  		return NULL;
  	}
  
@@ -74,6 +74,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -		      usb_sndbulkpipe(serial->dev, endpoint) | dir,
 -		      buf, len, callback, ctx);
 +	ep_desc = find_ep(serial, endpoint);
++	if (!ep_desc) {
++		/* leak the urb, something's wrong and the callers don't care */
++		return urb;
++	}
 +	if (usb_endpoint_xfer_int(ep_desc)) {
 +		ep_type_name = "INT";
 +		usb_fill_int_urb(urb, serial->dev,
@@ -93,7 +97,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +		return NULL;
 +	}
  
-+	dbg("%s - using urb %p for %s endpoint %d",
++	dbg("%s - using urb %p for %s endpoint %x",
 +	    __func__, urb, ep_type_name, endpoint);
  	return urb;
  }
diff --git a/version b/version
index 1abf178d14401b..1bd277a639383b 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.20-rc7
+2.6.20