diff options
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1149_linux-4.14.150.patch | 3404 |
2 files changed, 3408 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 3bfe86d5..5e20a187 100644 --- a/0000_README +++ b/0000_README @@ -639,6 +639,10 @@ Patch: 1148_linux-4.14.149.patch From: https://www.kernel.org Desc: Linux 4.14.149 +Patch: 1149_linux-4.14.150.patch +From: https://www.kernel.org +Desc: Linux 4.14.150 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1149_linux-4.14.150.patch b/1149_linux-4.14.150.patch new file mode 100644 index 00000000..58a70533 --- /dev/null +++ b/1149_linux-4.14.150.patch @@ -0,0 +1,3404 @@ +diff --git a/Documentation/usb/rio.txt b/Documentation/usb/rio.txt +deleted file mode 100644 +index aee715af7db7..000000000000 +--- a/Documentation/usb/rio.txt ++++ /dev/null +@@ -1,138 +0,0 @@ +-Copyright (C) 1999, 2000 Bruce Tenison +-Portions Copyright (C) 1999, 2000 David Nelson +-Thanks to David Nelson for guidance and the usage of the scanner.txt +-and scanner.c files to model our driver and this informative file. +- +-Mar. 2, 2000 +- +-CHANGES +- +-- Initial Revision +- +- +-OVERVIEW +- +-This README will address issues regarding how to configure the kernel +-to access a RIO 500 mp3 player. +-Before I explain how to use this to access the Rio500 please be warned: +- +-W A R N I N G: +--------------- +- +-Please note that this software is still under development. The authors +-are in no way responsible for any damage that may occur, no matter how +-inconsequential. +- +-It seems that the Rio has a problem when sending .mp3 with low batteries. +-I suggest when the batteries are low and you want to transfer stuff that you +-replace it with a fresh one. In my case, what happened is I lost two 16kb +-blocks (they are no longer usable to store information to it). But I don't +-know if that's normal or not; it could simply be a problem with the flash +-memory. +- +-In an extreme case, I left my Rio playing overnight and the batteries wore +-down to nothing and appear to have corrupted the flash memory. My RIO +-needed to be replaced as a result. Diamond tech support is aware of the +-problem. Do NOT allow your batteries to wear down to nothing before +-changing them. It appears RIO 500 firmware does not handle low battery +-power well at all. +- +-On systems with OHCI controllers, the kernel OHCI code appears to have +-power on problems with some chipsets. If you are having problems +-connecting to your RIO 500, try turning it on first and then plugging it +-into the USB cable. +- +-Contact information: +--------------------- +- +- The main page for the project is hosted at sourceforge.net in the following +- URL: <http://rio500.sourceforge.net>. You can also go to the project's +- sourceforge home page at: <http://sourceforge.net/projects/rio500/>. +- There is also a mailing list: rio500-users@lists.sourceforge.net +- +-Authors: +-------- +- +-Most of the code was written by Cesar Miquel <miquel@df.uba.ar>. Keith +-Clayton <kclayton@jps.net> is incharge of the PPC port and making sure +-things work there. Bruce Tenison <btenison@dibbs.net> is adding support +-for .fon files and also does testing. The program will mostly sure be +-re-written and Pete Ikusz along with the rest will re-design it. I would +-also like to thank Tri Nguyen <tmn_3022000@hotmail.com> who provided use +-with some important information regarding the communication with the Rio. +- +-ADDITIONAL INFORMATION and Userspace tools +- +-http://rio500.sourceforge.net/ +- +- +-REQUIREMENTS +- +-A host with a USB port. Ideally, either a UHCI (Intel) or OHCI +-(Compaq and others) hardware port should work. +- +-A Linux development kernel (2.3.x) with USB support enabled or a +-backported version to linux-2.2.x. See http://www.linux-usb.org for +-more information on accomplishing this. +- +-A Linux kernel with RIO 500 support enabled. +- +-'lspci' which is only needed to determine the type of USB hardware +-available in your machine. +- +-CONFIGURATION +- +-Using `lspci -v`, determine the type of USB hardware available. +- +- If you see something like: +- +- USB Controller: ...... +- Flags: ..... +- I/O ports at .... +- +- Then you have a UHCI based controller. +- +- If you see something like: +- +- USB Controller: ..... +- Flags: .... +- Memory at ..... +- +- Then you have a OHCI based controller. +- +-Using `make menuconfig` or your preferred method for configuring the +-kernel, select 'Support for USB', 'OHCI/UHCI' depending on your +-hardware (determined from the steps above), 'USB Diamond Rio500 support', and +-'Preliminary USB device filesystem'. Compile and install the modules +-(you may need to execute `depmod -a` to update the module +-dependencies). +- +-Add a device for the USB rio500: +- `mknod /dev/usb/rio500 c 180 64` +- +-Set appropriate permissions for /dev/usb/rio500 (don't forget about +-group and world permissions). Both read and write permissions are +-required for proper operation. +- +-Load the appropriate modules (if compiled as modules): +- +- OHCI: +- modprobe usbcore +- modprobe usb-ohci +- modprobe rio500 +- +- UHCI: +- modprobe usbcore +- modprobe usb-uhci (or uhci) +- modprobe rio500 +- +-That's it. The Rio500 Utils at: http://rio500.sourceforge.net should +-be able to access the rio500. +- +-BUGS +- +-If you encounter any problems feel free to drop me an email. +- +-Bruce Tenison +-btenison@dibbs.net +- +diff --git a/MAINTAINERS b/MAINTAINERS +index 6cb70b853323..029f96c43250 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -13886,13 +13886,6 @@ W: http://www.linux-usb.org/usbnet + S: Maintained + F: drivers/net/usb/dm9601.c + +-USB DIAMOND RIO500 DRIVER +-M: Cesar Miquel <miquel@df.uba.ar> +-L: rio500-users@lists.sourceforge.net +-W: http://rio500.sourceforge.net +-S: Maintained +-F: drivers/usb/misc/rio500* +- + USB EHCI DRIVER + M: Alan Stern <stern@rowland.harvard.edu> + L: linux-usb@vger.kernel.org +diff --git a/Makefile b/Makefile +index 93c3467eeb8c..3d96b277ffc9 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 4 + PATCHLEVEL = 14 +-SUBLEVEL = 149 ++SUBLEVEL = 150 + EXTRAVERSION = + NAME = Petit Gorille + +diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig +index 5ae5b5228467..ef484c4cfd1a 100644 +--- a/arch/arm/configs/badge4_defconfig ++++ b/arch/arm/configs/badge4_defconfig +@@ -91,7 +91,6 @@ CONFIG_USB_SERIAL_PL2303=m + CONFIG_USB_SERIAL_CYBERJACK=m + CONFIG_USB_SERIAL_XIRCOM=m + CONFIG_USB_SERIAL_OMNINET=m +-CONFIG_USB_RIO500=m + CONFIG_EXT2_FS=m + CONFIG_EXT3_FS=m + CONFIG_MSDOS_FS=y +diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig +index 09e1672777c9..0ba8df0d48b9 100644 +--- a/arch/arm/configs/corgi_defconfig ++++ b/arch/arm/configs/corgi_defconfig +@@ -197,7 +197,6 @@ CONFIG_USB_SERIAL_XIRCOM=m + CONFIG_USB_SERIAL_OMNINET=m + CONFIG_USB_EMI62=m + CONFIG_USB_EMI26=m +-CONFIG_USB_RIO500=m + CONFIG_USB_LEGOTOWER=m + CONFIG_USB_LCD=m + CONFIG_USB_CYTHERM=m +diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig +index d5e1370ec303..38a5680c8236 100644 +--- a/arch/arm/configs/pxa_defconfig ++++ b/arch/arm/configs/pxa_defconfig +@@ -588,7 +588,6 @@ CONFIG_USB_SERIAL_XIRCOM=m + CONFIG_USB_SERIAL_OMNINET=m + CONFIG_USB_EMI62=m + CONFIG_USB_EMI26=m +-CONFIG_USB_RIO500=m + CONFIG_USB_LEGOTOWER=m + CONFIG_USB_LCD=m + CONFIG_USB_CYTHERM=m +diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig +index 2afb359f3168..bd71d5bf98c9 100644 +--- a/arch/arm/configs/s3c2410_defconfig ++++ b/arch/arm/configs/s3c2410_defconfig +@@ -334,7 +334,6 @@ CONFIG_USB_EMI62=m + CONFIG_USB_EMI26=m + CONFIG_USB_ADUTUX=m + CONFIG_USB_SEVSEG=m +-CONFIG_USB_RIO500=m + CONFIG_USB_LEGOTOWER=m + CONFIG_USB_LCD=m + CONFIG_USB_CYPRESS_CY7C63=m +diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig +index 9ea82c118661..3aff4ca2a94e 100644 +--- a/arch/arm/configs/spitz_defconfig ++++ b/arch/arm/configs/spitz_defconfig +@@ -191,7 +191,6 @@ CONFIG_USB_SERIAL_XIRCOM=m + CONFIG_USB_SERIAL_OMNINET=m + CONFIG_USB_EMI62=m + CONFIG_USB_EMI26=m +-CONFIG_USB_RIO500=m + CONFIG_USB_LEGOTOWER=m + CONFIG_USB_LCD=m + CONFIG_USB_CYTHERM=m +diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig +index c3d0d0a6e044..6895430b5b2c 100644 +--- a/arch/mips/configs/mtx1_defconfig ++++ b/arch/mips/configs/mtx1_defconfig +@@ -623,7 +623,6 @@ CONFIG_USB_SERIAL_OMNINET=m + CONFIG_USB_EMI62=m + CONFIG_USB_EMI26=m + CONFIG_USB_ADUTUX=m +-CONFIG_USB_RIO500=m + CONFIG_USB_LEGOTOWER=m + CONFIG_USB_LCD=m + CONFIG_USB_CYPRESS_CY7C63=m +diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig +index 99679e514042..d67a39219fff 100644 +--- a/arch/mips/configs/rm200_defconfig ++++ b/arch/mips/configs/rm200_defconfig +@@ -344,7 +344,6 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y + CONFIG_USB_SERIAL_CYBERJACK=m + CONFIG_USB_SERIAL_XIRCOM=m + CONFIG_USB_SERIAL_OMNINET=m +-CONFIG_USB_RIO500=m + CONFIG_USB_LEGOTOWER=m + CONFIG_USB_LCD=m + CONFIG_USB_CYTHERM=m +diff --git a/arch/mips/loongson64/Platform b/arch/mips/loongson64/Platform +index 0fce4608aa88..12abf14aed4a 100644 +--- a/arch/mips/loongson64/Platform ++++ b/arch/mips/loongson64/Platform +@@ -43,6 +43,10 @@ else + $(call cc-option,-march=mips64r2,-mips64r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) + endif + ++# Some -march= flags enable MMI instructions, and GCC complains about that ++# support being enabled alongside -msoft-float. Thus explicitly disable MMI. ++cflags-y += $(call cc-option,-mno-loongson-mmi) ++ + # + # Loongson Machines' Support + # +diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile +index 0f455fdf822a..24f5f6baf2c0 100644 +--- a/arch/mips/vdso/Makefile ++++ b/arch/mips/vdso/Makefile +@@ -9,6 +9,7 @@ ccflags-vdso := \ + $(filter -mmicromips,$(KBUILD_CFLAGS)) \ + $(filter -march=%,$(KBUILD_CFLAGS)) \ + $(filter -m%-float,$(KBUILD_CFLAGS)) \ ++ $(filter -mno-loongson-%,$(KBUILD_CFLAGS)) \ + -D__VDSO__ + cflags-vdso := $(ccflags-vdso) \ + $(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \ +diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h +index eb0f80ce8524..3aa82deeab5a 100644 +--- a/arch/x86/include/asm/mwait.h ++++ b/arch/x86/include/asm/mwait.h +@@ -21,7 +21,7 @@ + #define MWAIT_ECX_INTERRUPT_BREAK 0x1 + #define MWAITX_ECX_TIMER_ENABLE BIT(1) + #define MWAITX_MAX_LOOPS ((u32)-1) +-#define MWAITX_DISABLE_CSTATES 0xf ++#define MWAITX_DISABLE_CSTATES 0xf0 + + static inline void __monitor(const void *eax, unsigned long ecx, + unsigned long edx) +diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c +index 4846eff7e4c8..17a0d0f5a1bf 100644 +--- a/arch/x86/lib/delay.c ++++ b/arch/x86/lib/delay.c +@@ -113,8 +113,8 @@ static void delay_mwaitx(unsigned long __loops) + __monitorx(raw_cpu_ptr(&cpu_tss_rw), 0, 0); + + /* +- * AMD, like Intel, supports the EAX hint and EAX=0xf +- * means, do not enter any deep C-state and we use it ++ * AMD, like Intel's MWAIT version, supports the EAX hint and ++ * EAX=0xf0 means, do not enter any deep C-state and we use it + * here in delay() to minimize wakeup latency. + */ + __mwaitx(MWAITX_DISABLE_CSTATES, delay, MWAITX_ECX_TIMER_ENABLE); +diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c +index c3eefa126e3b..f50072b51aef 100644 +--- a/drivers/firmware/efi/efi.c ++++ b/drivers/firmware/efi/efi.c +@@ -266,6 +266,9 @@ static __init int efivar_ssdt_load(void) + void *data; + int ret; + ++ if (!efivar_ssdt[0]) ++ return 0; ++ + ret = efivar_init(efivar_ssdt_iter, &entries, true, &entries); + + list_for_each_entry_safe(entry, aux, &entries, list) { +diff --git a/drivers/firmware/google/vpd_decode.c b/drivers/firmware/google/vpd_decode.c +index e75abe9fa122..6c7ab2ba85d2 100644 +--- a/drivers/firmware/google/vpd_decode.c ++++ b/drivers/firmware/google/vpd_decode.c +@@ -62,7 +62,7 @@ static int vpd_decode_entry(const u32 max_len, const u8 *input_buf, + if (max_len - consumed < *entry_len) + return VPD_FAIL; + +- consumed += decoded_len; ++ consumed += *entry_len; + *_consumed = consumed; + return VPD_OK; + } +diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c +index f1809a54fcee..c7f5f0be2d74 100644 +--- a/drivers/gpio/gpiolib.c ++++ b/drivers/gpio/gpiolib.c +@@ -2329,8 +2329,10 @@ static int _gpiod_direction_output_raw(struct gpio_desc *desc, int value) + if (!ret) + goto set_output_value; + /* Emulate open drain by not actively driving the line high */ +- if (val) +- return gpiod_direction_input(desc); ++ if (val) { ++ ret = gpiod_direction_input(desc); ++ goto set_output_flag; ++ } + } + else if (test_bit(FLAG_OPEN_SOURCE, &desc->flags)) { + ret = gpio_set_drive_single_ended(gc, gpio_chip_hwgpio(desc), +@@ -2338,8 +2340,10 @@ static int _gpiod_direction_output_raw(struct gpio_desc *desc, int value) + if (!ret) + goto set_output_value; + /* Emulate open source by not actively driving the line low */ +- if (!val) +- return gpiod_direction_input(desc); ++ if (!val) { ++ ret = gpiod_direction_input(desc); ++ goto set_output_flag; ++ } + } else { + gpio_set_drive_single_ended(gc, gpio_chip_hwgpio(desc), + PIN_CONFIG_DRIVE_PUSH_PULL); +@@ -2359,6 +2363,17 @@ set_output_value: + trace_gpio_value(desc_to_gpio(desc), 0, val); + trace_gpio_direction(desc_to_gpio(desc), 0, ret); + return ret; ++ ++set_output_flag: ++ /* ++ * When emulating open-source or open-drain functionalities by not ++ * actively driving the line (setting mode to input) we still need to ++ * set the IS_OUT flag or otherwise we won't be able to set the line ++ * value anymore. ++ */ ++ if (ret == 0) ++ set_bit(FLAG_IS_OUT, &desc->flags); ++ return ret; + } + + /** +@@ -2540,8 +2555,6 @@ static void _gpio_set_open_drain_value(struct gpio_desc *desc, bool value) + + if (value) { + err = chip->direction_input(chip, offset); +- if (!err) +- clear_bit(FLAG_IS_OUT, &desc->flags); + } else { + err = chip->direction_output(chip, offset, 0); + if (!err) +@@ -2571,8 +2584,6 @@ static void _gpio_set_open_source_value(struct gpio_desc *desc, bool value) + set_bit(FLAG_IS_OUT, &desc->flags); + } else { + err = chip->direction_input(chip, offset); +- if (!err) +- clear_bit(FLAG_IS_OUT, &desc->flags); + } + trace_gpio_direction(desc_to_gpio(desc), !value, err); + if (err < 0) +diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c +index 22426ae4af97..7d1895035af6 100644 +--- a/drivers/iio/adc/ad799x.c ++++ b/drivers/iio/adc/ad799x.c +@@ -817,10 +817,10 @@ static int ad799x_probe(struct i2c_client *client, + + ret = ad799x_write_config(st, st->chip_config->default_config); + if (ret < 0) +- goto error_disable_reg; ++ goto error_disable_vref; + ret = ad799x_read_config(st); + if (ret < 0) +- goto error_disable_reg; ++ goto error_disable_vref; + st->config = ret; + + ret = iio_triggered_buffer_setup(indio_dev, NULL, +diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c +index 0153df01e7b6..546bbe59c241 100644 +--- a/drivers/iio/adc/axp288_adc.c ++++ b/drivers/iio/adc/axp288_adc.c +@@ -16,6 +16,7 @@ + * + */ + ++#include <linux/dmi.h> + #include <linux/module.h> + #include <linux/kernel.h> + #include <linux/device.h> +@@ -34,6 +35,11 @@ + #define AXP288_ADC_EN_MASK 0xF0 + #define AXP288_ADC_TS_ENABLE 0x01 + ++#define AXP288_ADC_TS_BIAS_MASK GENMASK(5, 4) ++#define AXP288_ADC_TS_BIAS_20UA (0 << 4) ++#define AXP288_ADC_TS_BIAS_40UA (1 << 4) ++#define AXP288_ADC_TS_BIAS_60UA (2 << 4) ++#define AXP288_ADC_TS_BIAS_80UA (3 << 4) + #define AXP288_ADC_TS_CURRENT_ON_OFF_MASK GENMASK(1, 0) + #define AXP288_ADC_TS_CURRENT_OFF (0 << 0) + #define AXP288_ADC_TS_CURRENT_ON_WHEN_CHARGING (1 << 0) +@@ -194,10 +200,36 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev, + return ret; + } + ++/* ++ * We rely on the machine's firmware to correctly setup the TS pin bias current ++ * at boot. This lists systems with broken fw where we need to set it ourselves. ++ */ ++static const struct dmi_system_id axp288_adc_ts_bias_override[] = { ++ { ++ /* Lenovo Ideapad 100S (11 inch) */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 100S-11IBY"), ++ }, ++ .driver_data = (void *)(uintptr_t)AXP288_ADC_TS_BIAS_80UA, ++ }, ++ {} ++}; ++ + static int axp288_adc_initialize(struct axp288_adc_info *info) + { ++ const struct dmi_system_id *bias_override; + int ret, adc_enable_val; + ++ bias_override = dmi_first_match(axp288_adc_ts_bias_override); ++ if (bias_override) { ++ ret = regmap_update_bits(info->regmap, AXP288_ADC_TS_PIN_CTRL, ++ AXP288_ADC_TS_BIAS_MASK, ++ (uintptr_t)bias_override->driver_data); ++ if (ret) ++ return ret; ++ } ++ + /* + * Determine if the TS pin is enabled and set the TS current-source + * accordingly. +diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c +index 27005d84ed73..0dec733471d5 100644 +--- a/drivers/iio/adc/hx711.c ++++ b/drivers/iio/adc/hx711.c +@@ -89,20 +89,35 @@ struct hx711_data { + int gain_set; /* gain set on device */ + int gain_chan_a; /* gain for channel A */ + struct mutex lock; ++ /* ++ * delay after a rising edge on SCK until the data is ready DOUT ++ * this is dependent on the hx711 where the datasheet tells a ++ * maximum value of 100 ns ++ * but also on potential parasitic capacities on the wiring ++ */ ++ u32 data_ready_delay_ns; ++ u32 clock_frequency; + }; + + static int hx711_cycle(struct hx711_data *hx711_data) + { +- int val; ++ unsigned long flags; + + /* + * if preempted for more then 60us while PD_SCK is high: + * hx711 is going in reset + * ==> measuring is false + */ +- preempt_disable(); ++ local_irq_save(flags); + gpiod_set_value(hx711_data->gpiod_pd_sck, 1); +- val = gpiod_get_value(hx711_data->gpiod_dout); ++ ++ /* ++ * wait until DOUT is ready ++ * it turned out that parasitic capacities are extending the time ++ * until DOUT has reached it's value ++ */ ++ ndelay(hx711_data->data_ready_delay_ns); ++ + /* + * here we are not waiting for 0.2 us as suggested by the datasheet, + * because the oscilloscope showed in a test scenario +@@ -110,9 +125,16 @@ static int hx711_cycle(struct hx711_data *hx711_data) + * and 0.56 us for PD_SCK low on TI Sitara with 800 MHz + */ + gpiod_set_value(hx711_data->gpiod_pd_sck, 0); +- preempt_enable(); ++ local_irq_restore(flags); + +- return val; ++ /* ++ * make it a square wave for addressing cases with capacitance on ++ * PC_SCK ++ */ ++ ndelay(hx711_data->data_ready_delay_ns); ++ ++ /* sample as late as possible */ ++ return gpiod_get_value(hx711_data->gpiod_dout); + } + + static int hx711_read(struct hx711_data *hx711_data) +@@ -401,6 +423,7 @@ static const struct iio_chan_spec hx711_chan_spec[] = { + static int hx711_probe(struct platform_device *pdev) + { + struct device *dev = &pdev->dev; ++ struct device_node *np = dev->of_node; + struct hx711_data *hx711_data; + struct iio_dev *indio_dev; + int ret; +@@ -474,6 +497,22 @@ static int hx711_probe(struct platform_device *pdev) + hx711_data->gain_set = 128; + hx711_data->gain_chan_a = 128; + ++ hx711_data->clock_frequency = 400000; ++ ret = of_property_read_u32(np, "clock-frequency", ++ &hx711_data->clock_frequency); ++ ++ /* ++ * datasheet says the high level of PD_SCK has a maximum duration ++ * of 50 microseconds ++ */ ++ if (hx711_data->clock_frequency < 20000) { ++ dev_warn(dev, "clock-frequency too low - assuming 400 kHz\n"); ++ hx711_data->clock_frequency = 400000; ++ } ++ ++ hx711_data->data_ready_delay_ns = ++ 1000000000 / hx711_data->clock_frequency; ++ + platform_set_drvdata(pdev, indio_dev); + + indio_dev->name = "hx711"; +diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c +index b91ebc3483ce..743fd2cfdd54 100644 +--- a/drivers/iio/light/opt3001.c ++++ b/drivers/iio/light/opt3001.c +@@ -695,6 +695,7 @@ static irqreturn_t opt3001_irq(int irq, void *_iio) + struct iio_dev *iio = _iio; + struct opt3001 *opt = iio_priv(iio); + int ret; ++ bool wake_result_ready_queue = false; + + if (!opt->ok_to_ignore_lock) + mutex_lock(&opt->lock); +@@ -729,13 +730,16 @@ static irqreturn_t opt3001_irq(int irq, void *_iio) + } + opt->result = ret; + opt->result_ready = true; +- wake_up(&opt->result_ready_queue); ++ wake_result_ready_queue = true; + } + + out: + if (!opt->ok_to_ignore_lock) + mutex_unlock(&opt->lock); + ++ if (wake_result_ready_queue) ++ wake_up(&opt->result_ready_queue); ++ + return IRQ_HANDLED; + } + +diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c +index c0bba773db25..a7da1356a36e 100644 +--- a/drivers/media/usb/stkwebcam/stk-webcam.c ++++ b/drivers/media/usb/stkwebcam/stk-webcam.c +@@ -640,8 +640,7 @@ static int v4l_stk_release(struct file *fp) + dev->owner = NULL; + } + +- if (is_present(dev)) +- usb_autopm_put_interface(dev->interface); ++ usb_autopm_put_interface(dev->interface); + mutex_unlock(&dev->lock); + return v4l2_fh_release(fp); + } +diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c +index 6d0363deba61..0cbcbad8f074 100644 +--- a/drivers/staging/fbtft/fbtft-core.c ++++ b/drivers/staging/fbtft/fbtft-core.c +@@ -828,7 +828,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, + if (par->gamma.curves && gamma) { + if (fbtft_gamma_parse_str(par, + par->gamma.curves, gamma, strlen(gamma))) +- goto alloc_fail; ++ goto release_framebuf; + } + + /* Transmit buffer */ +@@ -845,7 +845,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, + if (txbuflen > 0) { + txbuf = devm_kzalloc(par->info->device, txbuflen, GFP_KERNEL); + if (!txbuf) +- goto alloc_fail; ++ goto release_framebuf; + par->txbuf.buf = txbuf; + par->txbuf.len = txbuflen; + } +@@ -881,6 +881,9 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, + + return info; + ++release_framebuf: ++ framebuffer_release(info); ++ + alloc_fail: + vfree(vmem); + +diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c +index 84a915199e64..6edd87867ce0 100644 +--- a/drivers/staging/vt6655/device_main.c ++++ b/drivers/staging/vt6655/device_main.c +@@ -1668,8 +1668,10 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) + + priv->hw->max_signal = 100; + +- if (vnt_init(priv)) ++ if (vnt_init(priv)) { ++ device_free_info(priv); + return -ENODEV; ++ } + + device_print_info(priv); + pci_set_drvdata(pcid, priv); +diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c +index c9b8d702dadc..2e76eb4c604c 100644 +--- a/drivers/tty/serial/uartlite.c ++++ b/drivers/tty/serial/uartlite.c +@@ -746,7 +746,8 @@ err_uart: + static void __exit ulite_exit(void) + { + platform_driver_unregister(&ulite_platform_driver); +- uart_unregister_driver(&ulite_uart_driver); ++ if (ulite_uart_driver.state) ++ uart_unregister_driver(&ulite_uart_driver); + } + + module_init(ulite_init); +diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c +index fb87c17ed6fa..50836f79f908 100644 +--- a/drivers/usb/class/usblp.c ++++ b/drivers/usb/class/usblp.c +@@ -474,10 +474,12 @@ static int usblp_release(struct inode *inode, struct file *file) + + mutex_lock(&usblp_mutex); + usblp->used = 0; +- if (usblp->present) { ++ if (usblp->present) + usblp_unlink_urbs(usblp); +- usb_autopm_put_interface(usblp->intf); +- } else /* finish cleanup from disconnect */ ++ ++ usb_autopm_put_interface(usblp->intf); ++ ++ if (!usblp->present) /* finish cleanup from disconnect */ + usblp_cleanup(usblp); + mutex_unlock(&usblp_mutex); + return 0; +diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c +index f04e91ef9e7c..7e90f786d923 100644 +--- a/drivers/usb/gadget/udc/dummy_hcd.c ++++ b/drivers/usb/gadget/udc/dummy_hcd.c +@@ -50,6 +50,7 @@ + #define DRIVER_VERSION "02 May 2005" + + #define POWER_BUDGET 500 /* in mA; use 8 for low-power port testing */ ++#define POWER_BUDGET_3 900 /* in mA */ + + static const char driver_name[] = "dummy_hcd"; + static const char driver_desc[] = "USB Host+Gadget Emulator"; +@@ -2439,7 +2440,7 @@ static int dummy_start_ss(struct dummy_hcd *dum_hcd) + dum_hcd->rh_state = DUMMY_RH_RUNNING; + dum_hcd->stream_en_ep = 0; + INIT_LIST_HEAD(&dum_hcd->urbp_list); +- dummy_hcd_to_hcd(dum_hcd)->power_budget = POWER_BUDGET; ++ dummy_hcd_to_hcd(dum_hcd)->power_budget = POWER_BUDGET_3; + dummy_hcd_to_hcd(dum_hcd)->state = HC_STATE_RUNNING; + dummy_hcd_to_hcd(dum_hcd)->uses_new_polling = 1; + #ifdef CONFIG_USB_OTG +diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c +index 94a7669ccb80..009b6796f405 100644 +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -3223,10 +3223,10 @@ static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len, + if (usb_urb_dir_out(urb)) { + len = sg_pcopy_to_buffer(urb->sg, urb->num_sgs, + seg->bounce_buf, new_buff_len, enqd_len); +- if (len != seg->bounce_len) ++ if (len != new_buff_len) + xhci_warn(xhci, + "WARN Wrong bounce buffer write length: %zu != %d\n", +- len, seg->bounce_len); ++ len, new_buff_len); + seg->bounce_dma = dma_map_single(dev, seg->bounce_buf, + max_pkt, DMA_TO_DEVICE); + } else { +diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c +index 8893d1566765..465d7fd507ad 100644 +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c +@@ -968,7 +968,7 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) + writel(command, &xhci->op_regs->command); + xhci->broken_suspend = 0; + if (xhci_handshake(&xhci->op_regs->status, +- STS_SAVE, 0, 10 * 1000)) { ++ STS_SAVE, 0, 20 * 1000)) { + /* + * AMD SNPS xHC 3.0 occasionally does not clear the + * SSS bit of USBSTS and when driver tries to poll +@@ -1044,6 +1044,18 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) + hibernated = true; + + if (!hibernated) { ++ /* ++ * Some controllers might lose power during suspend, so wait ++ * for controller not ready bit to clear, just as in xHC init. ++ */ ++ retval = xhci_handshake(&xhci->op_regs->status, ++ STS_CNR, 0, 10 * 1000 * 1000); ++ if (retval) { ++ xhci_warn(xhci, "Controller not ready at resume %d\n", ++ retval); ++ spin_unlock_irq(&xhci->lock); ++ return retval; ++ } + /* step 1: restore register */ + xhci_restore_registers(xhci); + /* step 2: initialize command ring buffer */ +@@ -4491,12 +4503,12 @@ static int xhci_update_timeout_for_endpoint(struct xhci_hcd *xhci, + alt_timeout = xhci_call_host_update_timeout_for_endpoint(xhci, udev, + desc, state, timeout); + +- /* If we found we can't enable hub-initiated LPM, or ++ /* If we found we can't enable hub-initiated LPM, and + * the U1 or U2 exit latency was too high to allow +- * device-initiated LPM as well, just stop searching. ++ * device-initiated LPM as well, then we will disable LPM ++ * for this device, so stop searching any further. + */ +- if (alt_timeout == USB3_LPM_DISABLED || +- alt_timeout == USB3_LPM_DEVICE_INITIATED) { ++ if (alt_timeout == USB3_LPM_DISABLED) { + *timeout = alt_timeout; + return -E2BIG; + } +@@ -4607,10 +4619,12 @@ static u16 xhci_calculate_lpm_timeout(struct usb_hcd *hcd, + if (intf->dev.driver) { + driver = to_usb_driver(intf->dev.driver); + if (driver && driver->disable_hub_initiated_lpm) { +- dev_dbg(&udev->dev, "Hub-initiated %s disabled " +- "at request of driver %s\n", +- state_name, driver->name); +- return xhci_get_timeout_no_hub_lpm(udev, state); ++ dev_dbg(&udev->dev, "Hub-initiated %s disabled at request of driver %s\n", ++ state_name, driver->name); ++ timeout = xhci_get_timeout_no_hub_lpm(udev, ++ state); ++ if (timeout == USB3_LPM_DISABLED) ++ return timeout; + } + } + +diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c +index 0b21ba757bba..f5f68866b7fb 100644 +--- a/drivers/usb/image/microtek.c ++++ b/drivers/usb/image/microtek.c +@@ -720,6 +720,10 @@ static int mts_usb_probe(struct usb_interface *intf, + + } + ++ if (ep_in_current != &ep_in_set[2]) { ++ MTS_WARNING("couldn't find two input bulk endpoints. Bailing out.\n"); ++ return -ENODEV; ++ } + + if ( ep_out == -1 ) { + MTS_WARNING( "couldn't find an output bulk endpoint. Bailing out.\n" ); +diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig +index 0f9f25db9163..ad78de3cbfaa 100644 +--- a/drivers/usb/misc/Kconfig ++++ b/drivers/usb/misc/Kconfig +@@ -46,16 +46,6 @@ config USB_SEVSEG + To compile this driver as a module, choose M here: the + module will be called usbsevseg. + +-config USB_RIO500 +- tristate "USB Diamond Rio500 support" +- help +- Say Y here if you want to connect a USB Rio500 mp3 player to your +- computer's USB port. Please read <file:Documentation/usb/rio.txt> +- for more information. +- +- To compile this driver as a module, choose M here: the +- module will be called rio500. +- + config USB_LEGOTOWER + tristate "USB Lego Infrared Tower support" + help +diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile +index 109f54f5b9aa..0d416eb624bb 100644 +--- a/drivers/usb/misc/Makefile ++++ b/drivers/usb/misc/Makefile +@@ -17,7 +17,6 @@ obj-$(CONFIG_USB_ISIGHTFW) += isight_firmware.o + obj-$(CONFIG_USB_LCD) += usblcd.o + obj-$(CONFIG_USB_LD) += ldusb.o + obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o +-obj-$(CONFIG_USB_RIO500) += rio500.o + obj-$(CONFIG_USB_TEST) += usbtest.o + obj-$(CONFIG_USB_EHSET_TEST_FIXTURE) += ehset.o + obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o +diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c +index 1c0ada75c35d..c8c8fa3f1f46 100644 +--- a/drivers/usb/misc/adutux.c ++++ b/drivers/usb/misc/adutux.c +@@ -79,6 +79,7 @@ struct adu_device { + char serial_number[8]; + + int open_count; /* number of times this port has been opened */ ++ unsigned long disconnected:1; + + char *read_buffer_primary; + int read_buffer_length; +@@ -120,7 +121,7 @@ static void adu_abort_transfers(struct adu_device *dev) + { + unsigned long flags; + +- if (dev->udev == NULL) ++ if (dev->disconnected) + return; + + /* shutdown transfer */ +@@ -150,6 +151,7 @@ static void adu_delete(struct adu_device *dev) + kfree(dev->read_buffer_secondary); + kfree(dev->interrupt_in_buffer); + kfree(dev->interrupt_out_buffer); ++ usb_put_dev(dev->udev); + kfree(dev); + } + +@@ -243,7 +245,7 @@ static int adu_open(struct inode *inode, struct file *file) + } + + dev = usb_get_intfdata(interface); +- if (!dev || !dev->udev) { ++ if (!dev) { + retval = -ENODEV; + goto exit_no_device; + } +@@ -326,7 +328,7 @@ static int adu_release(struct inode *inode, struct file *file) + } + + adu_release_internal(dev); +- if (dev->udev == NULL) { ++ if (dev->disconnected) { + /* the device was unplugged before the file was released */ + if (!dev->open_count) /* ... and we're the last user */ + adu_delete(dev); +@@ -355,7 +357,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count, + return -ERESTARTSYS; + + /* verify that the device wasn't unplugged */ +- if (dev->udev == NULL) { ++ if (dev->disconnected) { + retval = -ENODEV; + pr_err("No device or device unplugged %d\n", retval); + goto exit; +@@ -520,7 +522,7 @@ static ssize_t adu_write(struct file *file, const __user char *buffer, + goto exit_nolock; + + /* verify that the device wasn't unplugged */ +- if (dev->udev == NULL) { ++ if (dev->disconnected) { + retval = -ENODEV; + pr_err("No device or device unplugged %d\n", retval); + goto exit; +@@ -665,7 +667,7 @@ static int adu_probe(struct usb_interface *interface, + + mutex_init(&dev->mtx); + spin_lock_init(&dev->buflock); +- dev->udev = udev; ++ dev->udev = usb_get_dev(udev); + init_waitqueue_head(&dev->read_wait); + init_waitqueue_head(&dev->write_wait); + +@@ -761,19 +763,21 @@ error: + static void adu_disconnect(struct usb_interface *interface) + { + struct adu_device *dev; +- int minor; + + dev = usb_get_intfdata(interface); + +- mutex_lock(&dev->mtx); /* not interruptible */ +- dev->udev = NULL; /* poison */ +- minor = dev->minor; + usb_deregister_dev(interface, &adu_class); +- mutex_unlock(&dev->mtx); ++ ++ usb_poison_urb(dev->interrupt_in_urb); ++ usb_poison_urb(dev->interrupt_out_urb); + + mutex_lock(&adutux_mutex); + usb_set_intfdata(interface, NULL); + ++ mutex_lock(&dev->mtx); /* not interruptible */ ++ dev->disconnected = 1; ++ mutex_unlock(&dev->mtx); ++ + /* if the device is not opened, then we clean up right now */ + if (!dev->open_count) + adu_delete(dev); +diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c +index abec6e604a62..eb0795c5ff7a 100644 +--- a/drivers/usb/misc/chaoskey.c ++++ b/drivers/usb/misc/chaoskey.c +@@ -106,6 +106,7 @@ static void chaoskey_free(struct chaoskey *dev) + usb_free_urb(dev->urb); + kfree(dev->name); + kfree(dev->buf); ++ usb_put_intf(dev->interface); + kfree(dev); + } + } +@@ -153,6 +154,8 @@ static int chaoskey_probe(struct usb_interface *interface, + if (dev == NULL) + goto out; + ++ dev->interface = usb_get_intf(interface); ++ + dev->buf = kmalloc(size, GFP_KERNEL); + + if (dev->buf == NULL) +@@ -186,8 +189,6 @@ static int chaoskey_probe(struct usb_interface *interface, + strcat(dev->name, udev->serial); + } + +- dev->interface = interface; +- + dev->in_ep = in_ep; + + if (le16_to_cpu(udev->descriptor.idVendor) != ALEA_VENDOR_ID) +diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c +index 43bee6dad5c9..7f226cc3ef8a 100644 +--- a/drivers/usb/misc/iowarrior.c ++++ b/drivers/usb/misc/iowarrior.c +@@ -87,6 +87,7 @@ struct iowarrior { + char chip_serial[9]; /* the serial number string of the chip connected */ + int report_size; /* number of bytes in a report */ + u16 product_id; ++ struct usb_anchor submitted; + }; + + /*--------------*/ +@@ -246,6 +247,7 @@ static inline void iowarrior_delete(struct iowarrior *dev) + kfree(dev->int_in_buffer); + usb_free_urb(dev->int_in_urb); + kfree(dev->read_queue); ++ usb_put_intf(dev->interface); + kfree(dev); + } + +@@ -427,11 +429,13 @@ static ssize_t iowarrior_write(struct file *file, + retval = -EFAULT; + goto error; + } ++ usb_anchor_urb(int_out_urb, &dev->submitted); + retval = usb_submit_urb(int_out_urb, GFP_KERNEL); + if (retval) { + dev_dbg(&dev->interface->dev, + "submit error %d for urb nr.%d\n", + retval, atomic_read(&dev->write_busy)); ++ usb_unanchor_urb(int_out_urb); + goto error; + } + /* submit was ok */ +@@ -768,11 +772,13 @@ static int iowarrior_probe(struct usb_interface *interface, + init_waitqueue_head(&dev->write_wait); + + dev->udev = udev; +- dev->interface = interface; ++ dev->interface = usb_get_intf(interface); + + iface_desc = interface->cur_altsetting; + dev->product_id = le16_to_cpu(udev->descriptor.idProduct); + ++ init_usb_anchor(&dev->submitted); ++ + res = usb_find_last_int_in_endpoint(iface_desc, &dev->int_in_endpoint); + if (res) { + dev_err(&interface->dev, "no interrupt-in endpoint found\n"); +@@ -870,8 +876,6 @@ static void iowarrior_disconnect(struct usb_interface *interface) + dev = usb_get_intfdata(interface); + mutex_lock(&iowarrior_open_disc_lock); + usb_set_intfdata(interface, NULL); +- /* prevent device read, write and ioctl */ +- dev->present = 0; + + minor = dev->minor; + mutex_unlock(&iowarrior_open_disc_lock); +@@ -882,8 +886,7 @@ static void iowarrior_disconnect(struct usb_interface *interface) + mutex_lock(&dev->mutex); + + /* prevent device read, write and ioctl */ +- +- mutex_unlock(&dev->mutex); ++ dev->present = 0; + + if (dev->opened) { + /* There is a process that holds a filedescriptor to the device , +@@ -891,10 +894,13 @@ static void iowarrior_disconnect(struct usb_interface *interface) + Deleting the device is postponed until close() was called. + */ + usb_kill_urb(dev->int_in_urb); ++ usb_kill_anchored_urbs(&dev->submitted); + wake_up_interruptible(&dev->read_wait); + wake_up_interruptible(&dev->write_wait); ++ mutex_unlock(&dev->mutex); + } else { + /* no process is using the device, cleanup now */ ++ mutex_unlock(&dev->mutex); + iowarrior_delete(dev); + } + +diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c +index 6635a3c990f6..fa5cf349ae19 100644 +--- a/drivers/usb/misc/ldusb.c ++++ b/drivers/usb/misc/ldusb.c +@@ -157,6 +157,7 @@ MODULE_PARM_DESC(min_interrupt_out_interval, "Minimum interrupt out interval in + struct ld_usb { + struct mutex mutex; /* locks this structure */ + struct usb_interface *intf; /* save off the usb interface pointer */ ++ unsigned long disconnected:1; + + int open_count; /* number of times this port has been opened */ + +@@ -196,12 +197,10 @@ static void ld_usb_abort_transfers(struct ld_usb *dev) + /* shutdown transfer */ + if (dev->interrupt_in_running) { + dev->interrupt_in_running = 0; +- if (dev->intf) +- usb_kill_urb(dev->interrupt_in_urb); ++ usb_kill_urb(dev->interrupt_in_urb); + } + if (dev->interrupt_out_busy) +- if (dev->intf) +- usb_kill_urb(dev->interrupt_out_urb); ++ usb_kill_urb(dev->interrupt_out_urb); + } + + /** +@@ -209,8 +208,6 @@ static void ld_usb_abort_transfers(struct ld_usb *dev) + */ + static void ld_usb_delete(struct ld_usb *dev) + { +- ld_usb_abort_transfers(dev); +- + /* free data structures */ + usb_free_urb(dev->interrupt_in_urb); + usb_free_urb(dev->interrupt_out_urb); +@@ -266,7 +263,7 @@ static void ld_usb_interrupt_in_callback(struct urb *urb) + + resubmit: + /* resubmit if we're still running */ +- if (dev->interrupt_in_running && !dev->buffer_overflow && dev->intf) { ++ if (dev->interrupt_in_running && !dev->buffer_overflow) { + retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC); + if (retval) { + dev_err(&dev->intf->dev, +@@ -395,7 +392,7 @@ static int ld_usb_release(struct inode *inode, struct file *file) + retval = -ENODEV; + goto unlock_exit; + } +- if (dev->intf == NULL) { ++ if (dev->disconnected) { + /* the device was unplugged before the file was released */ + mutex_unlock(&dev->mutex); + /* unlock here as ld_usb_delete frees dev */ +@@ -426,7 +423,7 @@ static unsigned int ld_usb_poll(struct file *file, poll_table *wait) + + dev = file->private_data; + +- if (!dev->intf) ++ if (dev->disconnected) + return POLLERR | POLLHUP; + + poll_wait(file, &dev->read_wait, wait); +@@ -465,7 +462,7 @@ static ssize_t ld_usb_read(struct file *file, char __user *buffer, size_t count, + } + + /* verify that the device wasn't unplugged */ +- if (dev->intf == NULL) { ++ if (dev->disconnected) { + retval = -ENODEV; + printk(KERN_ERR "ldusb: No device or device unplugged %d\n", retval); + goto unlock_exit; +@@ -545,7 +542,7 @@ static ssize_t ld_usb_write(struct file *file, const char __user *buffer, + } + + /* verify that the device wasn't unplugged */ +- if (dev->intf == NULL) { ++ if (dev->disconnected) { + retval = -ENODEV; + printk(KERN_ERR "ldusb: No device or device unplugged %d\n", retval); + goto unlock_exit; +@@ -762,6 +759,9 @@ static void ld_usb_disconnect(struct usb_interface *intf) + /* give back our minor */ + usb_deregister_dev(intf, &ld_usb_class); + ++ usb_poison_urb(dev->interrupt_in_urb); ++ usb_poison_urb(dev->interrupt_out_urb); ++ + mutex_lock(&dev->mutex); + + /* if the device is not opened, then we clean up right now */ +@@ -769,7 +769,7 @@ static void ld_usb_disconnect(struct usb_interface *intf) + mutex_unlock(&dev->mutex); + ld_usb_delete(dev); + } else { +- dev->intf = NULL; ++ dev->disconnected = 1; + /* wake up pollers */ + wake_up_interruptible_all(&dev->read_wait); + wake_up_interruptible_all(&dev->write_wait); +diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c +index 5628f678ab59..155615aadc9c 100644 +--- a/drivers/usb/misc/legousbtower.c ++++ b/drivers/usb/misc/legousbtower.c +@@ -183,7 +183,6 @@ static const struct usb_device_id tower_table[] = { + }; + + MODULE_DEVICE_TABLE (usb, tower_table); +-static DEFINE_MUTEX(open_disc_mutex); + + #define LEGO_USB_TOWER_MINOR_BASE 160 + +@@ -195,6 +194,7 @@ struct lego_usb_tower { + unsigned char minor; /* the starting minor number for this device */ + + int open_count; /* number of times this port has been opened */ ++ unsigned long disconnected:1; + + char* read_buffer; + size_t read_buffer_length; /* this much came in */ +@@ -294,14 +294,13 @@ static inline void lego_usb_tower_debug_data(struct device *dev, + */ + static inline void tower_delete (struct lego_usb_tower *dev) + { +- tower_abort_transfers (dev); +- + /* free data structures */ + usb_free_urb(dev->interrupt_in_urb); + usb_free_urb(dev->interrupt_out_urb); + kfree (dev->read_buffer); + kfree (dev->interrupt_in_buffer); + kfree (dev->interrupt_out_buffer); ++ usb_put_dev(dev->udev); + kfree (dev); + } + +@@ -336,18 +335,14 @@ static int tower_open (struct inode *inode, struct file *file) + goto exit; + } + +- mutex_lock(&open_disc_mutex); + dev = usb_get_intfdata(interface); +- + if (!dev) { +- mutex_unlock(&open_disc_mutex); + retval = -ENODEV; + goto exit; + } + + /* lock this device */ + if (mutex_lock_interruptible(&dev->lock)) { +- mutex_unlock(&open_disc_mutex); + retval = -ERESTARTSYS; + goto exit; + } +@@ -355,12 +350,9 @@ static int tower_open (struct inode *inode, struct file *file) + + /* allow opening only once */ + if (dev->open_count) { +- mutex_unlock(&open_disc_mutex); + retval = -EBUSY; + goto unlock_exit; + } +- dev->open_count = 1; +- mutex_unlock(&open_disc_mutex); + + /* reset the tower */ + result = usb_control_msg (dev->udev, +@@ -400,13 +392,14 @@ static int tower_open (struct inode *inode, struct file *file) + dev_err(&dev->udev->dev, + "Couldn't submit interrupt_in_urb %d\n", retval); + dev->interrupt_in_running = 0; +- dev->open_count = 0; + goto unlock_exit; + } + + /* save device in the file's private structure */ + file->private_data = dev; + ++ dev->open_count = 1; ++ + unlock_exit: + mutex_unlock(&dev->lock); + +@@ -427,10 +420,9 @@ static int tower_release (struct inode *inode, struct file *file) + + if (dev == NULL) { + retval = -ENODEV; +- goto exit_nolock; ++ goto exit; + } + +- mutex_lock(&open_disc_mutex); + if (mutex_lock_interruptible(&dev->lock)) { + retval = -ERESTARTSYS; + goto exit; +@@ -442,7 +434,8 @@ static int tower_release (struct inode *inode, struct file *file) + retval = -ENODEV; + goto unlock_exit; + } +- if (dev->udev == NULL) { ++ ++ if (dev->disconnected) { + /* the device was unplugged before the file was released */ + + /* unlock here as tower_delete frees dev */ +@@ -460,10 +453,7 @@ static int tower_release (struct inode *inode, struct file *file) + + unlock_exit: + mutex_unlock(&dev->lock); +- + exit: +- mutex_unlock(&open_disc_mutex); +-exit_nolock: + return retval; + } + +@@ -481,10 +471,9 @@ static void tower_abort_transfers (struct lego_usb_tower *dev) + if (dev->interrupt_in_running) { + dev->interrupt_in_running = 0; + mb(); +- if (dev->udev) +- usb_kill_urb (dev->interrupt_in_urb); ++ usb_kill_urb(dev->interrupt_in_urb); + } +- if (dev->interrupt_out_busy && dev->udev) ++ if (dev->interrupt_out_busy) + usb_kill_urb(dev->interrupt_out_urb); + } + +@@ -520,7 +509,7 @@ static unsigned int tower_poll (struct file *file, poll_table *wait) + + dev = file->private_data; + +- if (!dev->udev) ++ if (dev->disconnected) + return POLLERR | POLLHUP; + + poll_wait(file, &dev->read_wait, wait); +@@ -567,7 +556,7 @@ static ssize_t tower_read (struct file *file, char __user *buffer, size_t count, + } + + /* verify that the device wasn't unplugged */ +- if (dev->udev == NULL) { ++ if (dev->disconnected) { + retval = -ENODEV; + pr_err("No device or device unplugged %d\n", retval); + goto unlock_exit; +@@ -653,7 +642,7 @@ static ssize_t tower_write (struct file *file, const char __user *buffer, size_t + } + + /* verify that the device wasn't unplugged */ +- if (dev->udev == NULL) { ++ if (dev->disconnected) { + retval = -ENODEV; + pr_err("No device or device unplugged %d\n", retval); + goto unlock_exit; +@@ -762,7 +751,7 @@ static void tower_interrupt_in_callback (struct urb *urb) + + resubmit: + /* resubmit if we're still running */ +- if (dev->interrupt_in_running && dev->udev) { ++ if (dev->interrupt_in_running) { + retval = usb_submit_urb (dev->interrupt_in_urb, GFP_ATOMIC); + if (retval) + dev_err(&dev->udev->dev, +@@ -825,8 +814,9 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device + + mutex_init(&dev->lock); + +- dev->udev = udev; ++ dev->udev = usb_get_dev(udev); + dev->open_count = 0; ++ dev->disconnected = 0; + + dev->read_buffer = NULL; + dev->read_buffer_length = 0; +@@ -894,8 +884,10 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device + get_version_reply, + sizeof(*get_version_reply), + 1000); +- if (result < 0) { +- dev_err(idev, "LEGO USB Tower get version control request failed\n"); ++ if (result < sizeof(*get_version_reply)) { ++ if (result >= 0) ++ result = -EIO; ++ dev_err(idev, "get version request failed: %d\n", result); + retval = result; + goto error; + } +@@ -913,7 +905,6 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device + if (retval) { + /* something prevented us from registering this driver */ + dev_err(idev, "Not able to get a minor for this device.\n"); +- usb_set_intfdata (interface, NULL); + goto error; + } + dev->minor = interface->minor; +@@ -945,23 +936,24 @@ static void tower_disconnect (struct usb_interface *interface) + int minor; + + dev = usb_get_intfdata (interface); +- mutex_lock(&open_disc_mutex); +- usb_set_intfdata (interface, NULL); + + minor = dev->minor; + +- /* give back our minor */ ++ /* give back our minor and prevent further open() */ + usb_deregister_dev (interface, &tower_class); + ++ /* stop I/O */ ++ usb_poison_urb(dev->interrupt_in_urb); ++ usb_poison_urb(dev->interrupt_out_urb); ++ + mutex_lock(&dev->lock); +- mutex_unlock(&open_disc_mutex); + + /* if the device is not opened, then we clean up right now */ + if (!dev->open_count) { + mutex_unlock(&dev->lock); + tower_delete (dev); + } else { +- dev->udev = NULL; ++ dev->disconnected = 1; + /* wake up pollers */ + wake_up_interruptible_all(&dev->read_wait); + wake_up_interruptible_all(&dev->write_wait); +diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c +deleted file mode 100644 +index c652a4fdc546..000000000000 +--- a/drivers/usb/misc/rio500.c ++++ /dev/null +@@ -1,574 +0,0 @@ +-/* -*- linux-c -*- */ +- +-/* +- * Driver for USB Rio 500 +- * +- * Cesar Miquel (miquel@df.uba.ar) +- * +- * based on hp_scanner.c by David E. Nelson (dnelson@jump.net) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License as +- * published by the Free Software Foundation; either version 2 of the +- * License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, but +- * WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +- * +- * Based upon mouse.c (Brad Keryan) and printer.c (Michael Gee). +- * +- * Changelog: +- * 30/05/2003 replaced lock/unlock kernel with up/down +- * Daniele Bellucci bellucda@tiscali.it +- * */ +- +-#include <linux/module.h> +-#include <linux/kernel.h> +-#include <linux/signal.h> +-#include <linux/sched/signal.h> +-#include <linux/mutex.h> +-#include <linux/errno.h> +-#include <linux/random.h> +-#include <linux/poll.h> +-#include <linux/slab.h> +-#include <linux/spinlock.h> +-#include <linux/usb.h> +-#include <linux/wait.h> +- +-#include "rio500_usb.h" +- +-#define DRIVER_AUTHOR "Cesar Miquel <miquel@df.uba.ar>" +-#define DRIVER_DESC "USB Rio 500 driver" +- +-#define RIO_MINOR 64 +- +-/* stall/wait timeout for rio */ +-#define NAK_TIMEOUT (HZ) +- +-#define IBUF_SIZE 0x1000 +- +-/* Size of the rio buffer */ +-#define OBUF_SIZE 0x10000 +- +-struct rio_usb_data { +- struct usb_device *rio_dev; /* init: probe_rio */ +- unsigned int ifnum; /* Interface number of the USB device */ +- int isopen; /* nz if open */ +- int present; /* Device is present on the bus */ +- char *obuf, *ibuf; /* transfer buffers */ +- char bulk_in_ep, bulk_out_ep; /* Endpoint assignments */ +- wait_queue_head_t wait_q; /* for timeouts */ +- struct mutex lock; /* general race avoidance */ +-}; +- +-static DEFINE_MUTEX(rio500_mutex); +-static struct rio_usb_data rio_instance; +- +-static int open_rio(struct inode *inode, struct file *file) +-{ +- struct rio_usb_data *rio = &rio_instance; +- +- /* against disconnect() */ +- mutex_lock(&rio500_mutex); +- mutex_lock(&(rio->lock)); +- +- if (rio->isopen || !rio->present) { +- mutex_unlock(&(rio->lock)); +- mutex_unlock(&rio500_mutex); +- return -EBUSY; +- } +- rio->isopen = 1; +- +- init_waitqueue_head(&rio->wait_q); +- +- mutex_unlock(&(rio->lock)); +- +- dev_info(&rio->rio_dev->dev, "Rio opened.\n"); +- mutex_unlock(&rio500_mutex); +- +- return 0; +-} +- +-static int close_rio(struct inode *inode, struct file *file) +-{ +- struct rio_usb_data *rio = &rio_instance; +- +- /* against disconnect() */ +- mutex_lock(&rio500_mutex); +- mutex_lock(&(rio->lock)); +- +- rio->isopen = 0; +- if (!rio->present) { +- /* cleanup has been delayed */ +- kfree(rio->ibuf); +- kfree(rio->obuf); +- rio->ibuf = NULL; +- rio->obuf = NULL; +- } else { +- dev_info(&rio->rio_dev->dev, "Rio closed.\n"); +- } +- mutex_unlock(&(rio->lock)); +- mutex_unlock(&rio500_mutex); +- return 0; +-} +- +-static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg) +-{ +- struct RioCommand rio_cmd; +- struct rio_usb_data *rio = &rio_instance; +- void __user *data; +- unsigned char *buffer; +- int result, requesttype; +- int retries; +- int retval=0; +- +- mutex_lock(&(rio->lock)); +- /* Sanity check to make sure rio is connected, powered, etc */ +- if (rio->present == 0 || rio->rio_dev == NULL) { +- retval = -ENODEV; +- goto err_out; +- } +- +- switch (cmd) { +- case RIO_RECV_COMMAND: +- data = (void __user *) arg; +- if (data == NULL) +- break; +- if (copy_from_user(&rio_cmd, data, sizeof(struct RioCommand))) { +- retval = -EFAULT; +- goto err_out; +- } +- if (rio_cmd.length < 0 || rio_cmd.length > PAGE_SIZE) { +- retval = -EINVAL; +- goto err_out; +- } +- buffer = (unsigned char *) __get_free_page(GFP_KERNEL); +- if (buffer == NULL) { +- retval = -ENOMEM; +- goto err_out; +- } +- if (copy_from_user(buffer, rio_cmd.buffer, rio_cmd.length)) { +- retval = -EFAULT; +- free_page((unsigned long) buffer); +- goto err_out; +- } +- +- requesttype = rio_cmd.requesttype | USB_DIR_IN | +- USB_TYPE_VENDOR | USB_RECIP_DEVICE; +- dev_dbg(&rio->rio_dev->dev, +- "sending command:reqtype=%0x req=%0x value=%0x index=%0x len=%0x\n", +- requesttype, rio_cmd.request, rio_cmd.value, +- rio_cmd.index, rio_cmd.length); +- /* Send rio control message */ +- retries = 3; +- while (retries) { +- result = usb_control_msg(rio->rio_dev, +- usb_rcvctrlpipe(rio-> rio_dev, 0), +- rio_cmd.request, +- requesttype, +- rio_cmd.value, +- rio_cmd.index, buffer, +- rio_cmd.length, +- jiffies_to_msecs(rio_cmd.timeout)); +- if (result == -ETIMEDOUT) +- retries--; +- else if (result < 0) { +- dev_err(&rio->rio_dev->dev, +- "Error executing ioctrl. code = %d\n", +- result); +- retries = 0; +- } else { +- dev_dbg(&rio->rio_dev->dev, +- "Executed ioctl. Result = %d (data=%02x)\n", +- result, buffer[0]); +- if (copy_to_user(rio_cmd.buffer, buffer, +- rio_cmd.length)) { +- free_page((unsigned long) buffer); +- retval = -EFAULT; +- goto err_out; +- } +- retries = 0; +- } +- +- /* rio_cmd.buffer contains a raw stream of single byte +- data which has been returned from rio. Data is +- interpreted at application level. For data that +- will be cast to data types longer than 1 byte, data +- will be little_endian and will potentially need to +- be swapped at the app level */ +- +- } +- free_page((unsigned long) buffer); +- break; +- +- case RIO_SEND_COMMAND: +- data = (void __user *) arg; +- if (data == NULL) +- break; +- if (copy_from_user(&rio_cmd, data, sizeof(struct RioCommand))) { +- retval = -EFAULT; +- goto err_out; +- } +- if (rio_cmd.length < 0 || rio_cmd.length > PAGE_SIZE) { +- retval = -EINVAL; +- goto err_out; +- } +- buffer = (unsigned char *) __get_free_page(GFP_KERNEL); +- if (buffer == NULL) { +- retval = -ENOMEM; +- goto err_out; +- } +- if (copy_from_user(buffer, rio_cmd.buffer, rio_cmd.length)) { +- free_page((unsigned long)buffer); +- retval = -EFAULT; +- goto err_out; +- } +- +- requesttype = rio_cmd.requesttype | USB_DIR_OUT | +- USB_TYPE_VENDOR | USB_RECIP_DEVICE; +- dev_dbg(&rio->rio_dev->dev, +- "sending command: reqtype=%0x req=%0x value=%0x index=%0x len=%0x\n", +- requesttype, rio_cmd.request, rio_cmd.value, +- rio_cmd.index, rio_cmd.length); +- /* Send rio control message */ +- retries = 3; +- while (retries) { +- result = usb_control_msg(rio->rio_dev, +- usb_sndctrlpipe(rio-> rio_dev, 0), +- rio_cmd.request, +- requesttype, +- rio_cmd.value, +- rio_cmd.index, buffer, +- rio_cmd.length, +- jiffies_to_msecs(rio_cmd.timeout)); +- if (result == -ETIMEDOUT) +- retries--; +- else if (result < 0) { +- dev_err(&rio->rio_dev->dev, +- "Error executing ioctrl. code = %d\n", +- result); +- retries = 0; +- } else { +- dev_dbg(&rio->rio_dev->dev, +- "Executed ioctl. Result = %d\n", result); +- retries = 0; +- +- } +- +- } +- free_page((unsigned long) buffer); +- break; +- +- default: +- retval = -ENOTTY; +- break; +- } +- +- +-err_out: +- mutex_unlock(&(rio->lock)); +- return retval; +-} +- +-static ssize_t +-write_rio(struct file *file, const char __user *buffer, +- size_t count, loff_t * ppos) +-{ +- DEFINE_WAIT(wait); +- struct rio_usb_data *rio = &rio_instance; +- +- unsigned long copy_size; +- unsigned long bytes_written = 0; +- unsigned int partial; +- +- int result = 0; +- int maxretry; +- int errn = 0; +- int intr; +- +- intr = mutex_lock_interruptible(&(rio->lock)); +- if (intr) +- return -EINTR; +- /* Sanity check to make sure rio is connected, powered, etc */ +- if (rio->present == 0 || rio->rio_dev == NULL) { +- mutex_unlock(&(rio->lock)); +- return -ENODEV; +- } +- +- +- +- do { +- unsigned long thistime; +- char *obuf = rio->obuf; +- +- thistime = copy_size = +- (count >= OBUF_SIZE) ? OBUF_SIZE : count; +- if (copy_from_user(rio->obuf, buffer, copy_size)) { +- errn = -EFAULT; +- goto error; +- } +- maxretry = 5; +- while (thistime) { +- if (!rio->rio_dev) { +- errn = -ENODEV; +- goto error; +- } +- if (signal_pending(current)) { +- mutex_unlock(&(rio->lock)); +- return bytes_written ? bytes_written : -EINTR; +- } +- +- result = usb_bulk_msg(rio->rio_dev, +- usb_sndbulkpipe(rio->rio_dev, 2), +- obuf, thistime, &partial, 5000); +- +- dev_dbg(&rio->rio_dev->dev, +- "write stats: result:%d thistime:%lu partial:%u\n", +- result, thistime, partial); +- +- if (result == -ETIMEDOUT) { /* NAK - so hold for a while */ +- if (!maxretry--) { +- errn = -ETIME; +- goto error; +- } +- prepare_to_wait(&rio->wait_q, &wait, TASK_INTERRUPTIBLE); +- schedule_timeout(NAK_TIMEOUT); +- finish_wait(&rio->wait_q, &wait); +- continue; +- } else if (!result && partial) { +- obuf += partial; +- thistime -= partial; +- } else +- break; +- } +- if (result) { +- dev_err(&rio->rio_dev->dev, "Write Whoops - %x\n", +- result); +- errn = -EIO; +- goto error; +- } +- bytes_written += copy_size; +- count -= copy_size; +- buffer += copy_size; +- } while (count > 0); +- +- mutex_unlock(&(rio->lock)); +- +- return bytes_written ? bytes_written : -EIO; +- +-error: +- mutex_unlock(&(rio->lock)); +- return errn; +-} +- +-static ssize_t +-read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos) +-{ +- DEFINE_WAIT(wait); +- struct rio_usb_data *rio = &rio_instance; +- ssize_t read_count; +- unsigned int partial; +- int this_read; +- int result; +- int maxretry = 10; +- char *ibuf; +- int intr; +- +- intr = mutex_lock_interruptible(&(rio->lock)); +- if (intr) +- return -EINTR; +- /* Sanity check to make sure rio is connected, powered, etc */ +- if (rio->present == 0 || rio->rio_dev == NULL) { +- mutex_unlock(&(rio->lock)); +- return -ENODEV; +- } +- +- ibuf = rio->ibuf; +- +- read_count = 0; +- +- +- while (count > 0) { +- if (signal_pending(current)) { +- mutex_unlock(&(rio->lock)); +- return read_count ? read_count : -EINTR; +- } +- if (!rio->rio_dev) { +- mutex_unlock(&(rio->lock)); +- return -ENODEV; +- } +- this_read = (count >= IBUF_SIZE) ? IBUF_SIZE : count; +- +- result = usb_bulk_msg(rio->rio_dev, +- usb_rcvbulkpipe(rio->rio_dev, 1), +- ibuf, this_read, &partial, +- 8000); +- +- dev_dbg(&rio->rio_dev->dev, +- "read stats: result:%d this_read:%u partial:%u\n", +- result, this_read, partial); +- +- if (partial) { +- count = this_read = partial; +- } else if (result == -ETIMEDOUT || result == 15) { /* FIXME: 15 ??? */ +- if (!maxretry--) { +- mutex_unlock(&(rio->lock)); +- dev_err(&rio->rio_dev->dev, +- "read_rio: maxretry timeout\n"); +- return -ETIME; +- } +- prepare_to_wait(&rio->wait_q, &wait, TASK_INTERRUPTIBLE); +- schedule_timeout(NAK_TIMEOUT); +- finish_wait(&rio->wait_q, &wait); +- continue; +- } else if (result != -EREMOTEIO) { +- mutex_unlock(&(rio->lock)); +- dev_err(&rio->rio_dev->dev, +- "Read Whoops - result:%d partial:%u this_read:%u\n", +- result, partial, this_read); +- return -EIO; +- } else { +- mutex_unlock(&(rio->lock)); +- return (0); +- } +- +- if (this_read) { +- if (copy_to_user(buffer, ibuf, this_read)) { +- mutex_unlock(&(rio->lock)); +- return -EFAULT; +- } +- count -= this_read; +- read_count += this_read; +- buffer += this_read; +- } +- } +- mutex_unlock(&(rio->lock)); +- return read_count; +-} +- +-static const struct file_operations usb_rio_fops = { +- .owner = THIS_MODULE, +- .read = read_rio, +- .write = write_rio, +- .unlocked_ioctl = ioctl_rio, +- .open = open_rio, +- .release = close_rio, +- .llseek = noop_llseek, +-}; +- +-static struct usb_class_driver usb_rio_class = { +- .name = "rio500%d", +- .fops = &usb_rio_fops, +- .minor_base = RIO_MINOR, +-}; +- +-static int probe_rio(struct usb_interface *intf, +- const struct usb_device_id *id) +-{ +- struct usb_device *dev = interface_to_usbdev(intf); +- struct rio_usb_data *rio = &rio_instance; +- int retval = 0; +- +- mutex_lock(&rio500_mutex); +- if (rio->present) { +- dev_info(&intf->dev, "Second USB Rio at address %d refused\n", dev->devnum); +- retval = -EBUSY; +- goto bail_out; +- } else { +- dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum); +- } +- +- retval = usb_register_dev(intf, &usb_rio_class); +- if (retval) { +- dev_err(&dev->dev, +- "Not able to get a minor for this device.\n"); +- retval = -ENOMEM; +- goto bail_out; +- } +- +- rio->rio_dev = dev; +- +- if (!(rio->obuf = kmalloc(OBUF_SIZE, GFP_KERNEL))) { +- dev_err(&dev->dev, +- "probe_rio: Not enough memory for the output buffer\n"); +- usb_deregister_dev(intf, &usb_rio_class); +- retval = -ENOMEM; +- goto bail_out; +- } +- dev_dbg(&intf->dev, "obuf address:%p\n", rio->obuf); +- +- if (!(rio->ibuf = kmalloc(IBUF_SIZE, GFP_KERNEL))) { +- dev_err(&dev->dev, +- "probe_rio: Not enough memory for the input buffer\n"); +- usb_deregister_dev(intf, &usb_rio_class); +- kfree(rio->obuf); +- retval = -ENOMEM; +- goto bail_out; +- } +- dev_dbg(&intf->dev, "ibuf address:%p\n", rio->ibuf); +- +- mutex_init(&(rio->lock)); +- +- usb_set_intfdata (intf, rio); +- rio->present = 1; +-bail_out: +- mutex_unlock(&rio500_mutex); +- +- return retval; +-} +- +-static void disconnect_rio(struct usb_interface *intf) +-{ +- struct rio_usb_data *rio = usb_get_intfdata (intf); +- +- usb_set_intfdata (intf, NULL); +- mutex_lock(&rio500_mutex); +- if (rio) { +- usb_deregister_dev(intf, &usb_rio_class); +- +- mutex_lock(&(rio->lock)); +- if (rio->isopen) { +- rio->isopen = 0; +- /* better let it finish - the release will do whats needed */ +- rio->rio_dev = NULL; +- mutex_unlock(&(rio->lock)); +- mutex_unlock(&rio500_mutex); +- return; +- } +- kfree(rio->ibuf); +- kfree(rio->obuf); +- +- dev_info(&intf->dev, "USB Rio disconnected.\n"); +- +- rio->present = 0; +- mutex_unlock(&(rio->lock)); +- } +- mutex_unlock(&rio500_mutex); +-} +- +-static const struct usb_device_id rio_table[] = { +- { USB_DEVICE(0x0841, 1) }, /* Rio 500 */ +- { } /* Terminating entry */ +-}; +- +-MODULE_DEVICE_TABLE (usb, rio_table); +- +-static struct usb_driver rio_driver = { +- .name = "rio500", +- .probe = probe_rio, +- .disconnect = disconnect_rio, +- .id_table = rio_table, +-}; +- +-module_usb_driver(rio_driver); +- +-MODULE_AUTHOR( DRIVER_AUTHOR ); +-MODULE_DESCRIPTION( DRIVER_DESC ); +-MODULE_LICENSE("GPL"); +- +diff --git a/drivers/usb/misc/rio500_usb.h b/drivers/usb/misc/rio500_usb.h +deleted file mode 100644 +index 359abc98e706..000000000000 +--- a/drivers/usb/misc/rio500_usb.h ++++ /dev/null +@@ -1,37 +0,0 @@ +-/* ---------------------------------------------------------------------- +- +- Copyright (C) 2000 Cesar Miquel (miquel@df.uba.ar) +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +- +- ---------------------------------------------------------------------- */ +- +- +- +-#define RIO_SEND_COMMAND 0x1 +-#define RIO_RECV_COMMAND 0x2 +- +-#define RIO_DIR_OUT 0x0 +-#define RIO_DIR_IN 0x1 +- +-struct RioCommand { +- short length; +- int request; +- int requesttype; +- int value; +- int index; +- void __user *buffer; +- int timeout; +-}; +diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c +index 0f5ad896c7e3..6a50e22e0a72 100644 +--- a/drivers/usb/misc/usblcd.c ++++ b/drivers/usb/misc/usblcd.c +@@ -17,6 +17,7 @@ + #include <linux/slab.h> + #include <linux/errno.h> + #include <linux/mutex.h> ++#include <linux/rwsem.h> + #include <linux/uaccess.h> + #include <linux/usb.h> + +@@ -56,6 +57,8 @@ struct usb_lcd { + using up all RAM */ + struct usb_anchor submitted; /* URBs to wait for + before suspend */ ++ struct rw_semaphore io_rwsem; ++ unsigned long disconnected:1; + }; + #define to_lcd_dev(d) container_of(d, struct usb_lcd, kref) + +@@ -141,6 +144,13 @@ static ssize_t lcd_read(struct file *file, char __user * buffer, + + dev = file->private_data; + ++ down_read(&dev->io_rwsem); ++ ++ if (dev->disconnected) { ++ retval = -ENODEV; ++ goto out_up_io; ++ } ++ + /* do a blocking bulk read to get data from the device */ + retval = usb_bulk_msg(dev->udev, + usb_rcvbulkpipe(dev->udev, +@@ -157,6 +167,9 @@ static ssize_t lcd_read(struct file *file, char __user * buffer, + retval = bytes_read; + } + ++out_up_io: ++ up_read(&dev->io_rwsem); ++ + return retval; + } + +@@ -236,11 +249,18 @@ static ssize_t lcd_write(struct file *file, const char __user * user_buffer, + if (r < 0) + return -EINTR; + ++ down_read(&dev->io_rwsem); ++ ++ if (dev->disconnected) { ++ retval = -ENODEV; ++ goto err_up_io; ++ } ++ + /* create a urb, and a buffer for it, and copy the data to the urb */ + urb = usb_alloc_urb(0, GFP_KERNEL); + if (!urb) { + retval = -ENOMEM; +- goto err_no_buf; ++ goto err_up_io; + } + + buf = usb_alloc_coherent(dev->udev, count, GFP_KERNEL, +@@ -277,6 +297,7 @@ static ssize_t lcd_write(struct file *file, const char __user * user_buffer, + the USB core will eventually free it entirely */ + usb_free_urb(urb); + ++ up_read(&dev->io_rwsem); + exit: + return count; + error_unanchor: +@@ -284,7 +305,8 @@ error_unanchor: + error: + usb_free_coherent(dev->udev, count, buf, urb->transfer_dma); + usb_free_urb(urb); +-err_no_buf: ++err_up_io: ++ up_read(&dev->io_rwsem); + up(&dev->limit_sem); + return retval; + } +@@ -324,6 +346,7 @@ static int lcd_probe(struct usb_interface *interface, + + kref_init(&dev->kref); + sema_init(&dev->limit_sem, USB_LCD_CONCURRENT_WRITES); ++ init_rwsem(&dev->io_rwsem); + init_usb_anchor(&dev->submitted); + + dev->udev = usb_get_dev(interface_to_usbdev(interface)); +@@ -421,6 +444,12 @@ static void lcd_disconnect(struct usb_interface *interface) + /* give back our minor */ + usb_deregister_dev(interface, &lcd_class); + ++ down_write(&dev->io_rwsem); ++ dev->disconnected = 1; ++ up_write(&dev->io_rwsem); ++ ++ usb_kill_anchored_urbs(&dev->submitted); ++ + /* decrement our usage count */ + kref_put(&dev->kref, lcd_delete); + +diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c +index 081570677f24..ec42f6b75564 100644 +--- a/drivers/usb/misc/yurex.c ++++ b/drivers/usb/misc/yurex.c +@@ -64,6 +64,7 @@ struct usb_yurex { + + struct kref kref; + struct mutex io_mutex; ++ unsigned long disconnected:1; + struct fasync_struct *async_queue; + wait_queue_head_t waitq; + +@@ -111,6 +112,7 @@ static void yurex_delete(struct kref *kref) + dev->int_buffer, dev->urb->transfer_dma); + usb_free_urb(dev->urb); + } ++ usb_put_intf(dev->interface); + usb_put_dev(dev->udev); + kfree(dev); + } +@@ -136,6 +138,7 @@ static void yurex_interrupt(struct urb *urb) + switch (status) { + case 0: /*success*/ + break; ++ /* The device is terminated or messed up, give up */ + case -EOVERFLOW: + dev_err(&dev->interface->dev, + "%s - overflow with length %d, actual length is %d\n", +@@ -144,12 +147,13 @@ static void yurex_interrupt(struct urb *urb) + case -ENOENT: + case -ESHUTDOWN: + case -EILSEQ: +- /* The device is terminated, clean up */ ++ case -EPROTO: ++ case -ETIME: + return; + default: + dev_err(&dev->interface->dev, + "%s - unknown status received: %d\n", __func__, status); +- goto exit; ++ return; + } + + /* handle received message */ +@@ -181,7 +185,6 @@ static void yurex_interrupt(struct urb *urb) + break; + } + +-exit: + retval = usb_submit_urb(dev->urb, GFP_ATOMIC); + if (retval) { + dev_err(&dev->interface->dev, "%s - usb_submit_urb failed: %d\n", +@@ -208,7 +211,7 @@ static int yurex_probe(struct usb_interface *interface, const struct usb_device_ + init_waitqueue_head(&dev->waitq); + + dev->udev = usb_get_dev(interface_to_usbdev(interface)); +- dev->interface = interface; ++ dev->interface = usb_get_intf(interface); + + /* set up the endpoint information */ + iface_desc = interface->cur_altsetting; +@@ -319,8 +322,9 @@ static void yurex_disconnect(struct usb_interface *interface) + + /* prevent more I/O from starting */ + usb_poison_urb(dev->urb); ++ usb_poison_urb(dev->cntl_urb); + mutex_lock(&dev->io_mutex); +- dev->interface = NULL; ++ dev->disconnected = 1; + mutex_unlock(&dev->io_mutex); + + /* wakeup waiters */ +@@ -408,7 +412,7 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count, + dev = file->private_data; + + mutex_lock(&dev->io_mutex); +- if (!dev->interface) { /* already disconnected */ ++ if (dev->disconnected) { /* already disconnected */ + mutex_unlock(&dev->io_mutex); + return -ENODEV; + } +@@ -443,7 +447,7 @@ static ssize_t yurex_write(struct file *file, const char __user *user_buffer, + goto error; + + mutex_lock(&dev->io_mutex); +- if (!dev->interface) { /* already disconnected */ ++ if (dev->disconnected) { /* already disconnected */ + mutex_unlock(&dev->io_mutex); + retval = -ENODEV; + goto error; +diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h +index 8c5fc12ad778..b8620aa6b72e 100644 +--- a/drivers/usb/renesas_usbhs/common.h ++++ b/drivers/usb/renesas_usbhs/common.h +@@ -213,6 +213,7 @@ struct usbhs_priv; + /* DCPCTR */ + #define BSTS (1 << 15) /* Buffer Status */ + #define SUREQ (1 << 14) /* Sending SETUP Token */ ++#define INBUFM (1 << 14) /* (PIPEnCTR) Transfer Buffer Monitor */ + #define CSSTS (1 << 12) /* CSSTS Status */ + #define ACLRM (1 << 9) /* Buffer Auto-Clear Mode */ + #define SQCLR (1 << 8) /* Toggle Bit Clear */ +diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c +index b6d9308d43ba..4a486fa5473e 100644 +--- a/drivers/usb/renesas_usbhs/fifo.c ++++ b/drivers/usb/renesas_usbhs/fifo.c +@@ -98,7 +98,7 @@ static void __usbhsf_pkt_del(struct usbhs_pkt *pkt) + list_del_init(&pkt->node); + } + +-static struct usbhs_pkt *__usbhsf_pkt_get(struct usbhs_pipe *pipe) ++struct usbhs_pkt *__usbhsf_pkt_get(struct usbhs_pipe *pipe) + { + return list_first_entry_or_null(&pipe->list, struct usbhs_pkt, node); + } +diff --git a/drivers/usb/renesas_usbhs/fifo.h b/drivers/usb/renesas_usbhs/fifo.h +index 8b98507d7abc..c1fb39252b23 100644 +--- a/drivers/usb/renesas_usbhs/fifo.h ++++ b/drivers/usb/renesas_usbhs/fifo.h +@@ -106,5 +106,6 @@ void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt, + void *buf, int len, int zero, int sequence); + struct usbhs_pkt *usbhs_pkt_pop(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt); + void usbhs_pkt_start(struct usbhs_pipe *pipe); ++struct usbhs_pkt *__usbhsf_pkt_get(struct usbhs_pipe *pipe); + + #endif /* RENESAS_USB_FIFO_H */ +diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c +index c068b673420b..0dedb0d91dcc 100644 +--- a/drivers/usb/renesas_usbhs/mod_gadget.c ++++ b/drivers/usb/renesas_usbhs/mod_gadget.c +@@ -729,8 +729,7 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge) + struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv); + struct device *dev = usbhsg_gpriv_to_dev(gpriv); + unsigned long flags; +- +- usbhsg_pipe_disable(uep); ++ int ret = 0; + + dev_dbg(dev, "set halt %d (pipe %d)\n", + halt, usbhs_pipe_number(pipe)); +@@ -738,6 +737,18 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge) + /******************** spin lock ********************/ + usbhs_lock(priv, flags); + ++ /* ++ * According to usb_ep_set_halt()'s description, this function should ++ * return -EAGAIN if the IN endpoint has any queue or data. Note ++ * that the usbhs_pipe_is_dir_in() returns false if the pipe is an ++ * IN endpoint in the gadget mode. ++ */ ++ if (!usbhs_pipe_is_dir_in(pipe) && (__usbhsf_pkt_get(pipe) || ++ usbhs_pipe_contains_transmittable_data(pipe))) { ++ ret = -EAGAIN; ++ goto out; ++ } ++ + if (halt) + usbhs_pipe_stall(pipe); + else +@@ -748,10 +759,11 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge) + else + usbhsg_status_clr(gpriv, USBHSG_STATUS_WEDGE); + ++out: + usbhs_unlock(priv, flags); + /******************** spin unlock ******************/ + +- return 0; ++ return ret; + } + + static int usbhsg_ep_set_halt(struct usb_ep *ep, int value) +diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c +index d811f0550c04..98ed6fcacd36 100644 +--- a/drivers/usb/renesas_usbhs/pipe.c ++++ b/drivers/usb/renesas_usbhs/pipe.c +@@ -286,6 +286,21 @@ int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe) + return -EBUSY; + } + ++bool usbhs_pipe_contains_transmittable_data(struct usbhs_pipe *pipe) ++{ ++ u16 val; ++ ++ /* Do not support for DCP pipe */ ++ if (usbhs_pipe_is_dcp(pipe)) ++ return false; ++ ++ val = usbhsp_pipectrl_get(pipe); ++ if (val & INBUFM) ++ return true; ++ ++ return false; ++} ++ + /* + * PID ctrl + */ +diff --git a/drivers/usb/renesas_usbhs/pipe.h b/drivers/usb/renesas_usbhs/pipe.h +index 95185fdb29b1..e4144704ee02 100644 +--- a/drivers/usb/renesas_usbhs/pipe.h ++++ b/drivers/usb/renesas_usbhs/pipe.h +@@ -90,6 +90,7 @@ void usbhs_pipe_init(struct usbhs_priv *priv, + int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe); + void usbhs_pipe_clear(struct usbhs_pipe *pipe); + int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe); ++bool usbhs_pipe_contains_transmittable_data(struct usbhs_pipe *pipe); + void usbhs_pipe_enable(struct usbhs_pipe *pipe); + void usbhs_pipe_disable(struct usbhs_pipe *pipe); + void usbhs_pipe_stall(struct usbhs_pipe *pipe); +diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c +index d2349c094767..8b5c99df0f2b 100644 +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -1025,6 +1025,9 @@ static const struct usb_device_id id_table_combined[] = { + /* EZPrototypes devices */ + { USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) }, + { USB_DEVICE_INTERFACE_NUMBER(UNJO_VID, UNJO_ISODEBUG_V1_PID, 1) }, ++ /* Sienna devices */ ++ { USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) }, ++ { USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) }, + { } /* Terminating entry */ + }; + +diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h +index f12d806220b4..22d66217cb41 100644 +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -39,6 +39,9 @@ + + #define FTDI_LUMEL_PD12_PID 0x6002 + ++/* Sienna Serial Interface by Secyourit GmbH */ ++#define FTDI_SIENNA_PID 0x8348 ++ + /* Cyber Cortex AV by Fabulous Silicon (http://fabuloussilicon.com) */ + #define CYBER_CORTEX_AV_PID 0x8698 + +@@ -688,6 +691,12 @@ + #define BANDB_TTL3USB9M_PID 0xAC50 + #define BANDB_ZZ_PROG1_USB_PID 0xBA02 + ++/* ++ * Echelon USB Serial Interface ++ */ ++#define ECHELON_VID 0x0920 ++#define ECHELON_U20_PID 0x7500 ++ + /* + * Intrepid Control Systems (http://www.intrepidcs.com/) ValueCAN and NeoVI + */ +diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c +index 5662d324edd2..2c5a53bdccd4 100644 +--- a/drivers/usb/serial/keyspan.c ++++ b/drivers/usb/serial/keyspan.c +@@ -1745,8 +1745,8 @@ static struct urb *keyspan_setup_urb(struct usb_serial *serial, int endpoint, + + ep_desc = find_ep(serial, endpoint); + if (!ep_desc) { +- /* leak the urb, something's wrong and the callers don't care */ +- return urb; ++ usb_free_urb(urb); ++ return NULL; + } + if (usb_endpoint_xfer_int(ep_desc)) { + ep_type_name = "INT"; +diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c +index 959f462c6f72..b9fad046828d 100644 +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -422,6 +422,7 @@ static void option_instat_callback(struct urb *urb); + #define CINTERION_PRODUCT_PH8_AUDIO 0x0083 + #define CINTERION_PRODUCT_AHXX_2RMNET 0x0084 + #define CINTERION_PRODUCT_AHXX_AUDIO 0x0085 ++#define CINTERION_PRODUCT_CLS8 0x00b0 + + /* Olivetti products */ + #define OLIVETTI_VENDOR_ID 0x0b3c +@@ -1157,6 +1158,14 @@ static const struct usb_device_id option_ids[] = { + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff), + .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) }, ++ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1050, 0xff), /* Telit FN980 (rmnet) */ ++ .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) }, ++ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1051, 0xff), /* Telit FN980 (MBIM) */ ++ .driver_info = NCTRL(0) | RSVD(1) }, ++ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1052, 0xff), /* Telit FN980 (RNDIS) */ ++ .driver_info = NCTRL(2) | RSVD(3) }, ++ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1053, 0xff), /* Telit FN980 (ECM) */ ++ .driver_info = NCTRL(0) | RSVD(1) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910), + .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM), +@@ -1850,6 +1859,8 @@ static const struct usb_device_id option_ids[] = { + .driver_info = RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_2RMNET, 0xff) }, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) }, ++ { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_CLS8, 0xff), ++ .driver_info = RSVD(0) | RSVD(4) }, + { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, + { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) }, + { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) }, +diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c +index bb34f9f7eaf4..8115b7cccf1a 100644 +--- a/drivers/usb/serial/usb-serial.c ++++ b/drivers/usb/serial/usb-serial.c +@@ -314,10 +314,7 @@ static void serial_cleanup(struct tty_struct *tty) + serial = port->serial; + owner = serial->type->driver.owner; + +- mutex_lock(&serial->disc_mutex); +- if (!serial->disconnected) +- usb_autopm_put_interface(serial->interface); +- mutex_unlock(&serial->disc_mutex); ++ usb_autopm_put_interface(serial->interface); + + usb_serial_put(serial); + module_put(owner); +diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c +index bb0bd732e29a..7140d06ae04f 100644 +--- a/drivers/usb/usb-skeleton.c ++++ b/drivers/usb/usb-skeleton.c +@@ -63,6 +63,7 @@ struct usb_skel { + spinlock_t err_lock; /* lock for errors */ + struct kref kref; + struct mutex io_mutex; /* synchronize I/O with disconnect */ ++ unsigned long disconnected:1; + wait_queue_head_t bulk_in_wait; /* to wait for an ongoing read */ + }; + #define to_skel_dev(d) container_of(d, struct usb_skel, kref) +@@ -75,6 +76,7 @@ static void skel_delete(struct kref *kref) + struct usb_skel *dev = to_skel_dev(kref); + + usb_free_urb(dev->bulk_in_urb); ++ usb_put_intf(dev->interface); + usb_put_dev(dev->udev); + kfree(dev->bulk_in_buffer); + kfree(dev); +@@ -126,10 +128,7 @@ static int skel_release(struct inode *inode, struct file *file) + return -ENODEV; + + /* allow the device to be autosuspended */ +- mutex_lock(&dev->io_mutex); +- if (dev->interface) +- usb_autopm_put_interface(dev->interface); +- mutex_unlock(&dev->io_mutex); ++ usb_autopm_put_interface(dev->interface); + + /* decrement the count on our device */ + kref_put(&dev->kref, skel_delete); +@@ -241,7 +240,7 @@ static ssize_t skel_read(struct file *file, char *buffer, size_t count, + if (rv < 0) + return rv; + +- if (!dev->interface) { /* disconnect() was called */ ++ if (dev->disconnected) { /* disconnect() was called */ + rv = -ENODEV; + goto exit; + } +@@ -422,7 +421,7 @@ static ssize_t skel_write(struct file *file, const char *user_buffer, + + /* this lock makes sure we don't submit URBs to gone devices */ + mutex_lock(&dev->io_mutex); +- if (!dev->interface) { /* disconnect() was called */ ++ if (dev->disconnected) { /* disconnect() was called */ + mutex_unlock(&dev->io_mutex); + retval = -ENODEV; + goto error; +@@ -507,7 +506,7 @@ static int skel_probe(struct usb_interface *interface, + init_waitqueue_head(&dev->bulk_in_wait); + + dev->udev = usb_get_dev(interface_to_usbdev(interface)); +- dev->interface = interface; ++ dev->interface = usb_get_intf(interface); + + /* set up the endpoint information */ + /* use only the first bulk-in and bulk-out endpoints */ +@@ -573,7 +572,7 @@ static void skel_disconnect(struct usb_interface *interface) + + /* prevent more I/O from starting */ + mutex_lock(&dev->io_mutex); +- dev->interface = NULL; ++ dev->disconnected = 1; + mutex_unlock(&dev->io_mutex); + + usb_kill_anchored_urbs(&dev->submitted); +diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c +index f8ef2e3fbf63..e35301e5fe8e 100644 +--- a/fs/btrfs/tree-log.c ++++ b/fs/btrfs/tree-log.c +@@ -2729,7 +2729,8 @@ out: + * in the tree of log roots + */ + static int update_log_root(struct btrfs_trans_handle *trans, +- struct btrfs_root *log) ++ struct btrfs_root *log, ++ struct btrfs_root_item *root_item) + { + struct btrfs_fs_info *fs_info = log->fs_info; + int ret; +@@ -2737,10 +2738,10 @@ static int update_log_root(struct btrfs_trans_handle *trans, + if (log->log_transid == 1) { + /* insert root item on the first sync */ + ret = btrfs_insert_root(trans, fs_info->log_root_tree, +- &log->root_key, &log->root_item); ++ &log->root_key, root_item); + } else { + ret = btrfs_update_root(trans, fs_info->log_root_tree, +- &log->root_key, &log->root_item); ++ &log->root_key, root_item); + } + return ret; + } +@@ -2836,6 +2837,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, + struct btrfs_fs_info *fs_info = root->fs_info; + struct btrfs_root *log = root->log_root; + struct btrfs_root *log_root_tree = fs_info->log_root_tree; ++ struct btrfs_root_item new_root_item; + int log_transid = 0; + struct btrfs_log_ctx root_log_ctx; + struct blk_plug plug; +@@ -2901,17 +2903,25 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, + goto out; + } + ++ /* ++ * We _must_ update under the root->log_mutex in order to make sure we ++ * have a consistent view of the log root we are trying to commit at ++ * this moment. ++ * ++ * We _must_ copy this into a local copy, because we are not holding the ++ * log_root_tree->log_mutex yet. This is important because when we ++ * commit the log_root_tree we must have a consistent view of the ++ * log_root_tree when we update the super block to point at the ++ * log_root_tree bytenr. If we update the log_root_tree here we'll race ++ * with the commit and possibly point at the new block which we may not ++ * have written out. ++ */ + btrfs_set_root_node(&log->root_item, log->node); ++ memcpy(&new_root_item, &log->root_item, sizeof(new_root_item)); + + root->log_transid++; + log->log_transid = root->log_transid; + root->log_start_pid = 0; +- /* +- * Update or create log root item under the root's log_mutex to prevent +- * races with concurrent log syncs that can lead to failure to update +- * log root item because it was not created yet. +- */ +- ret = update_log_root(trans, log); + /* + * IO has been started, blocks of the log tree have WRITTEN flag set + * in their headers. new modifications of the log will be written to +@@ -2932,6 +2942,14 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, + mutex_unlock(&log_root_tree->log_mutex); + + mutex_lock(&log_root_tree->log_mutex); ++ ++ /* ++ * Now we are safe to update the log_root_tree because we're under the ++ * log_mutex, and we're a current writer so we're holding the commit ++ * open until we drop the log_mutex. ++ */ ++ ret = update_log_root(trans, log, &new_root_item); ++ + if (atomic_dec_and_test(&log_root_tree->log_writers)) { + /* + * Implicit memory barrier after atomic_dec_and_test +diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c +index ca98afda3cdb..f00a7ce3eb6e 100644 +--- a/fs/cifs/dir.c ++++ b/fs/cifs/dir.c +@@ -841,10 +841,16 @@ lookup_out: + static int + cifs_d_revalidate(struct dentry *direntry, unsigned int flags) + { ++ struct inode *inode; ++ + if (flags & LOOKUP_RCU) + return -ECHILD; + + if (d_really_is_positive(direntry)) { ++ inode = d_inode(direntry); ++ if ((flags & LOOKUP_REVAL) && !CIFS_CACHE_READ(CIFS_I(inode))) ++ CIFS_I(inode)->time = 0; /* force reval */ ++ + if (cifs_revalidate_dentry(direntry)) + return 0; + else { +@@ -855,7 +861,7 @@ cifs_d_revalidate(struct dentry *direntry, unsigned int flags) + * attributes will have been updated by + * cifs_revalidate_dentry(). + */ +- if (IS_AUTOMOUNT(d_inode(direntry)) && ++ if (IS_AUTOMOUNT(inode) && + !(direntry->d_flags & DCACHE_NEED_AUTOMOUNT)) { + spin_lock(&direntry->d_lock); + direntry->d_flags |= DCACHE_NEED_AUTOMOUNT; +diff --git a/fs/cifs/file.c b/fs/cifs/file.c +index 6ee8f9270892..71a960da7cce 100644 +--- a/fs/cifs/file.c ++++ b/fs/cifs/file.c +@@ -252,6 +252,12 @@ cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb, + rc = cifs_get_inode_info(&inode, full_path, buf, inode->i_sb, + xid, fid); + ++ if (rc) { ++ server->ops->close(xid, tcon, fid); ++ if (rc == -ESTALE) ++ rc = -EOPENSTALE; ++ } ++ + out: + kfree(buf); + return rc; +diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c +index e7192ee7a89c..a35c14105906 100644 +--- a/fs/cifs/inode.c ++++ b/fs/cifs/inode.c +@@ -410,6 +410,7 @@ int cifs_get_inode_info_unix(struct inode **pinode, + /* if uniqueid is different, return error */ + if (unlikely(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM && + CIFS_I(*pinode)->uniqueid != fattr.cf_uniqueid)) { ++ CIFS_I(*pinode)->time = 0; /* force reval */ + rc = -ESTALE; + goto cgiiu_exit; + } +@@ -417,6 +418,7 @@ int cifs_get_inode_info_unix(struct inode **pinode, + /* if filetype is different, return error */ + if (unlikely(((*pinode)->i_mode & S_IFMT) != + (fattr.cf_mode & S_IFMT))) { ++ CIFS_I(*pinode)->time = 0; /* force reval */ + rc = -ESTALE; + goto cgiiu_exit; + } +@@ -925,6 +927,7 @@ cifs_get_inode_info(struct inode **inode, const char *full_path, + /* if uniqueid is different, return error */ + if (unlikely(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM && + CIFS_I(*inode)->uniqueid != fattr.cf_uniqueid)) { ++ CIFS_I(*inode)->time = 0; /* force reval */ + rc = -ESTALE; + goto cgii_exit; + } +@@ -932,6 +935,7 @@ cifs_get_inode_info(struct inode **inode, const char *full_path, + /* if filetype is different, return error */ + if (unlikely(((*inode)->i_mode & S_IFMT) != + (fattr.cf_mode & S_IFMT))) { ++ CIFS_I(*inode)->time = 0; /* force reval */ + rc = -ESTALE; + goto cgii_exit; + } +diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c +index 344aa861774b..e70975ca723b 100644 +--- a/fs/f2fs/super.c ++++ b/fs/f2fs/super.c +@@ -1814,11 +1814,11 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + struct super_block *sb = sbi->sb; + unsigned int blocksize; + +- if (F2FS_SUPER_MAGIC != le32_to_cpu(raw_super->magic)) { ++ if (le32_to_cpu(raw_super->magic) != F2FS_SUPER_MAGIC) { + f2fs_msg(sb, KERN_INFO, + "Magic Mismatch, valid(0x%x) - read(0x%x)", + F2FS_SUPER_MAGIC, le32_to_cpu(raw_super->magic)); +- return 1; ++ return -EINVAL; + } + + /* Currently, support only 4KB page cache size */ +@@ -1826,7 +1826,7 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + f2fs_msg(sb, KERN_INFO, + "Invalid page_cache_size (%lu), supports only 4KB\n", + PAGE_SIZE); +- return 1; ++ return -EFSCORRUPTED; + } + + /* Currently, support only 4KB block size */ +@@ -1835,7 +1835,7 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + f2fs_msg(sb, KERN_INFO, + "Invalid blocksize (%u), supports only 4KB\n", + blocksize); +- return 1; ++ return -EFSCORRUPTED; + } + + /* check log blocks per segment */ +@@ -1843,7 +1843,7 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + f2fs_msg(sb, KERN_INFO, + "Invalid log blocks per segment (%u)\n", + le32_to_cpu(raw_super->log_blocks_per_seg)); +- return 1; ++ return -EFSCORRUPTED; + } + + /* Currently, support 512/1024/2048/4096 bytes sector size */ +@@ -1853,7 +1853,7 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + F2FS_MIN_LOG_SECTOR_SIZE) { + f2fs_msg(sb, KERN_INFO, "Invalid log sectorsize (%u)", + le32_to_cpu(raw_super->log_sectorsize)); +- return 1; ++ return -EFSCORRUPTED; + } + if (le32_to_cpu(raw_super->log_sectors_per_block) + + le32_to_cpu(raw_super->log_sectorsize) != +@@ -1862,7 +1862,7 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + "Invalid log sectors per block(%u) log sectorsize(%u)", + le32_to_cpu(raw_super->log_sectors_per_block), + le32_to_cpu(raw_super->log_sectorsize)); +- return 1; ++ return -EFSCORRUPTED; + } + + segment_count = le32_to_cpu(raw_super->segment_count); +@@ -1878,7 +1878,7 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + f2fs_msg(sb, KERN_INFO, + "Invalid segment count (%u)", + segment_count); +- return 1; ++ return -EFSCORRUPTED; + } + + if (total_sections > segment_count || +@@ -1887,35 +1887,35 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + f2fs_msg(sb, KERN_INFO, + "Invalid segment/section count (%u, %u x %u)", + segment_count, total_sections, segs_per_sec); +- return 1; ++ return -EFSCORRUPTED; + } + + if ((segment_count / segs_per_sec) < total_sections) { + f2fs_msg(sb, KERN_INFO, + "Small segment_count (%u < %u * %u)", + segment_count, segs_per_sec, total_sections); +- return 1; ++ return -EFSCORRUPTED; + } + + if (segment_count > (le64_to_cpu(raw_super->block_count) >> 9)) { + f2fs_msg(sb, KERN_INFO, + "Wrong segment_count / block_count (%u > %llu)", + segment_count, le64_to_cpu(raw_super->block_count)); +- return 1; ++ return -EFSCORRUPTED; + } + + if (secs_per_zone > total_sections || !secs_per_zone) { + f2fs_msg(sb, KERN_INFO, + "Wrong secs_per_zone / total_sections (%u, %u)", + secs_per_zone, total_sections); +- return 1; ++ return -EFSCORRUPTED; + } + if (le32_to_cpu(raw_super->extension_count) > F2FS_MAX_EXTENSION) { + f2fs_msg(sb, KERN_INFO, + "Corrupted extension count (%u > %u)", + le32_to_cpu(raw_super->extension_count), + F2FS_MAX_EXTENSION); +- return 1; ++ return -EFSCORRUPTED; + } + + if (le32_to_cpu(raw_super->cp_payload) > +@@ -1924,7 +1924,7 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + "Insane cp_payload (%u > %u)", + le32_to_cpu(raw_super->cp_payload), + blocks_per_seg - F2FS_CP_PACKS); +- return 1; ++ return -EFSCORRUPTED; + } + + /* check reserved ino info */ +@@ -1936,12 +1936,12 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, + le32_to_cpu(raw_super->node_ino), + le32_to_cpu(raw_super->meta_ino), + le32_to_cpu(raw_super->root_ino)); +- return 1; ++ return -EFSCORRUPTED; + } + + /* check CP/SIT/NAT/SSA/MAIN_AREA area boundary */ + if (sanity_check_area_boundary(sbi, bh)) +- return 1; ++ return -EFSCORRUPTED; + + return 0; + } +@@ -2216,11 +2216,11 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi, + } + + /* sanity checking of raw super */ +- if (sanity_check_raw_super(sbi, bh)) { ++ err = sanity_check_raw_super(sbi, bh); ++ if (err) { + f2fs_msg(sb, KERN_ERR, + "Can't find valid F2FS filesystem in %dth superblock", + block + 1); +- err = -EFSCORRUPTED; + brelse(bh); + continue; + } +diff --git a/fs/libfs.c b/fs/libfs.c +index 3aabe553fc45..49623301e5f0 100644 +--- a/fs/libfs.c ++++ b/fs/libfs.c +@@ -86,58 +86,47 @@ int dcache_dir_close(struct inode *inode, struct file *file) + EXPORT_SYMBOL(dcache_dir_close); + + /* parent is locked at least shared */ +-static struct dentry *next_positive(struct dentry *parent, +- struct list_head *from, +- int count) ++/* ++ * Returns an element of siblings' list. ++ * We are looking for <count>th positive after <p>; if ++ * found, dentry is grabbed and passed to caller via *<res>. ++ * If no such element exists, the anchor of list is returned ++ * and *<res> is set to NULL. ++ */ ++static struct list_head *scan_positives(struct dentry *cursor, ++ struct list_head *p, ++ loff_t count, ++ struct dentry **res) + { +- unsigned *seq = &parent->d_inode->i_dir_seq, n; +- struct dentry *res; +- struct list_head *p; +- bool skipped; +- int i; ++ struct dentry *dentry = cursor->d_parent, *found = NULL; + +-retry: +- i = count; +- skipped = false; +- n = smp_load_acquire(seq) & ~1; +- res = NULL; +- rcu_read_lock(); +- for (p = from->next; p != &parent->d_subdirs; p = p->next) { ++ spin_lock(&dentry->d_lock); ++ while ((p = p->next) != &dentry->d_subdirs) { + struct dentry *d = list_entry(p, struct dentry, d_child); +- if (!simple_positive(d)) { +- skipped = true; +- } else if (!--i) { +- res = d; +- break; ++ // we must at least skip cursors, to avoid livelocks ++ if (d->d_flags & DCACHE_DENTRY_CURSOR) ++ continue; ++ if (simple_positive(d) && !--count) { ++ spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED); ++ if (simple_positive(d)) ++ found = dget_dlock(d); ++ spin_unlock(&d->d_lock); ++ if (likely(found)) ++ break; ++ count = 1; ++ } ++ if (need_resched()) { ++ list_move(&cursor->d_child, p); ++ p = &cursor->d_child; ++ spin_unlock(&dentry->d_lock); ++ cond_resched(); ++ spin_lock(&dentry->d_lock); + } + } +- rcu_read_unlock(); +- if (skipped) { +- smp_rmb(); +- if (unlikely(*seq != n)) +- goto retry; +- } +- return res; +-} +- +-static void move_cursor(struct dentry *cursor, struct list_head *after) +-{ +- struct dentry *parent = cursor->d_parent; +- unsigned n, *seq = &parent->d_inode->i_dir_seq; +- spin_lock(&parent->d_lock); +- for (;;) { +- n = *seq; +- if (!(n & 1) && cmpxchg(seq, n, n + 1) == n) +- break; +- cpu_relax(); +- } +- __list_del(cursor->d_child.prev, cursor->d_child.next); +- if (after) +- list_add(&cursor->d_child, after); +- else +- list_add_tail(&cursor->d_child, &parent->d_subdirs); +- smp_store_release(seq, n + 2); +- spin_unlock(&parent->d_lock); ++ spin_unlock(&dentry->d_lock); ++ dput(*res); ++ *res = found; ++ return p; + } + + loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence) +@@ -153,17 +142,28 @@ loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence) + return -EINVAL; + } + if (offset != file->f_pos) { ++ struct dentry *cursor = file->private_data; ++ struct dentry *to = NULL; ++ struct list_head *p; ++ + file->f_pos = offset; +- if (file->f_pos >= 2) { +- struct dentry *cursor = file->private_data; +- struct dentry *to; +- loff_t n = file->f_pos - 2; +- +- inode_lock_shared(dentry->d_inode); +- to = next_positive(dentry, &dentry->d_subdirs, n); +- move_cursor(cursor, to ? &to->d_child : NULL); +- inode_unlock_shared(dentry->d_inode); ++ inode_lock_shared(dentry->d_inode); ++ ++ if (file->f_pos > 2) { ++ p = scan_positives(cursor, &dentry->d_subdirs, ++ file->f_pos - 2, &to); ++ spin_lock(&dentry->d_lock); ++ list_move(&cursor->d_child, p); ++ spin_unlock(&dentry->d_lock); ++ } else { ++ spin_lock(&dentry->d_lock); ++ list_del_init(&cursor->d_child); ++ spin_unlock(&dentry->d_lock); + } ++ ++ dput(to); ++ ++ inode_unlock_shared(dentry->d_inode); + } + return offset; + } +@@ -185,25 +185,29 @@ int dcache_readdir(struct file *file, struct dir_context *ctx) + { + struct dentry *dentry = file->f_path.dentry; + struct dentry *cursor = file->private_data; +- struct list_head *p = &cursor->d_child; +- struct dentry *next; +- bool moved = false; ++ struct list_head *anchor = &dentry->d_subdirs; ++ struct dentry *next = NULL; ++ struct list_head *p; + + if (!dir_emit_dots(file, ctx)) + return 0; + + if (ctx->pos == 2) +- p = &dentry->d_subdirs; +- while ((next = next_positive(dentry, p, 1)) != NULL) { ++ p = anchor; ++ else ++ p = &cursor->d_child; ++ ++ while ((p = scan_positives(cursor, p, 1, &next)) != anchor) { + if (!dir_emit(ctx, next->d_name.name, next->d_name.len, + d_inode(next)->i_ino, dt_type(d_inode(next)))) + break; +- moved = true; +- p = &next->d_child; + ctx->pos++; + } +- if (moved) +- move_cursor(cursor, p); ++ spin_lock(&dentry->d_lock); ++ list_move_tail(&cursor->d_child, p); ++ spin_unlock(&dentry->d_lock); ++ dput(next); ++ + return 0; + } + EXPORT_SYMBOL(dcache_readdir); +diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c +index 614ce1f8b4ac..9cdac9945483 100644 +--- a/fs/nfs/direct.c ++++ b/fs/nfs/direct.c +@@ -122,32 +122,49 @@ static inline int put_dreq(struct nfs_direct_req *dreq) + } + + static void +-nfs_direct_good_bytes(struct nfs_direct_req *dreq, struct nfs_pgio_header *hdr) ++nfs_direct_handle_truncated(struct nfs_direct_req *dreq, ++ const struct nfs_pgio_header *hdr, ++ ssize_t dreq_len) + { +- int i; +- ssize_t count; ++ struct nfs_direct_mirror *mirror = &dreq->mirrors[hdr->pgio_mirror_idx]; ++ ++ if (!(test_bit(NFS_IOHDR_ERROR, &hdr->flags) || ++ test_bit(NFS_IOHDR_EOF, &hdr->flags))) ++ return; ++ if (dreq->max_count >= dreq_len) { ++ dreq->max_count = dreq_len; ++ if (dreq->count > dreq_len) ++ dreq->count = dreq_len; ++ ++ if (test_bit(NFS_IOHDR_ERROR, &hdr->flags)) ++ dreq->error = hdr->error; ++ else /* Clear outstanding error if this is EOF */ ++ dreq->error = 0; ++ } ++ if (mirror->count > dreq_len) ++ mirror->count = dreq_len; ++} + +- WARN_ON_ONCE(dreq->count >= dreq->max_count); ++static void ++nfs_direct_count_bytes(struct nfs_direct_req *dreq, ++ const struct nfs_pgio_header *hdr) ++{ ++ struct nfs_direct_mirror *mirror = &dreq->mirrors[hdr->pgio_mirror_idx]; ++ loff_t hdr_end = hdr->io_start + hdr->good_bytes; ++ ssize_t dreq_len = 0; + +- if (dreq->mirror_count == 1) { +- dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes; +- dreq->count += hdr->good_bytes; +- } else { +- /* mirrored writes */ +- count = dreq->mirrors[hdr->pgio_mirror_idx].count; +- if (count + dreq->io_start < hdr->io_start + hdr->good_bytes) { +- count = hdr->io_start + hdr->good_bytes - dreq->io_start; +- dreq->mirrors[hdr->pgio_mirror_idx].count = count; +- } +- /* update the dreq->count by finding the minimum agreed count from all +- * mirrors */ +- count = dreq->mirrors[0].count; ++ if (hdr_end > dreq->io_start) ++ dreq_len = hdr_end - dreq->io_start; + +- for (i = 1; i < dreq->mirror_count; i++) +- count = min(count, dreq->mirrors[i].count); ++ nfs_direct_handle_truncated(dreq, hdr, dreq_len); + +- dreq->count = count; +- } ++ if (dreq_len > dreq->max_count) ++ dreq_len = dreq->max_count; ++ ++ if (mirror->count < dreq_len) ++ mirror->count = dreq_len; ++ if (dreq->count < dreq_len) ++ dreq->count = dreq_len; + } + + /* +@@ -401,20 +418,12 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr) + struct nfs_direct_req *dreq = hdr->dreq; + + spin_lock(&dreq->lock); +- if (test_bit(NFS_IOHDR_ERROR, &hdr->flags)) +- dreq->error = hdr->error; +- + if (test_bit(NFS_IOHDR_REDO, &hdr->flags)) { + spin_unlock(&dreq->lock); + goto out_put; + } + +- if (hdr->good_bytes != 0) +- nfs_direct_good_bytes(dreq, hdr); +- +- if (test_bit(NFS_IOHDR_EOF, &hdr->flags)) +- dreq->error = 0; +- ++ nfs_direct_count_bytes(dreq, hdr); + spin_unlock(&dreq->lock); + + while (!list_empty(&hdr->pages)) { +@@ -651,6 +660,9 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) + nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo); + + dreq->count = 0; ++ dreq->max_count = 0; ++ list_for_each_entry(req, &reqs, wb_list) ++ dreq->max_count += req->wb_bytes; + dreq->verf.committed = NFS_INVALID_STABLE_HOW; + nfs_clear_pnfs_ds_commit_verifiers(&dreq->ds_cinfo); + for (i = 0; i < dreq->mirror_count; i++) +@@ -783,17 +795,13 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) + nfs_init_cinfo_from_dreq(&cinfo, dreq); + + spin_lock(&dreq->lock); +- +- if (test_bit(NFS_IOHDR_ERROR, &hdr->flags)) +- dreq->error = hdr->error; +- + if (test_bit(NFS_IOHDR_REDO, &hdr->flags)) { + spin_unlock(&dreq->lock); + goto out_put; + } + ++ nfs_direct_count_bytes(dreq, hdr); + if (hdr->good_bytes != 0) { +- nfs_direct_good_bytes(dreq, hdr); + if (nfs_write_need_commit(hdr)) { + if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES) + request_commit = true; +diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c +index 0b0282d2f011..10151c9268e1 100644 +--- a/fs/xfs/xfs_super.c ++++ b/fs/xfs/xfs_super.c +@@ -1715,6 +1715,7 @@ xfs_fs_fill_super( + out_close_devices: + xfs_close_devices(mp); + out_free_fsname: ++ sb->s_fs_info = NULL; + xfs_free_fsname(mp); + kfree(mp); + out: +@@ -1732,6 +1733,10 @@ xfs_fs_put_super( + { + struct xfs_mount *mp = XFS_M(sb); + ++ /* if ->fill_super failed, we have no mount to tear down */ ++ if (!sb->s_fs_info) ++ return; ++ + xfs_notice(mp, "Unmounting Filesystem"); + xfs_filestream_unmount(mp); + xfs_unmountfs(mp); +@@ -1741,6 +1746,8 @@ xfs_fs_put_super( + xfs_destroy_percpu_counters(mp); + xfs_destroy_mount_workqueues(mp); + xfs_close_devices(mp); ++ ++ sb->s_fs_info = NULL; + xfs_free_fsname(mp); + kfree(mp); + } +@@ -1760,6 +1767,9 @@ xfs_fs_nr_cached_objects( + struct super_block *sb, + struct shrink_control *sc) + { ++ /* Paranoia: catch incorrect calls during mount setup or teardown */ ++ if (WARN_ON_ONCE(!sb->s_fs_info)) ++ return 0; + return xfs_reclaim_inodes_count(XFS_M(sb)); + } + +diff --git a/kernel/fork.c b/kernel/fork.c +index 919e7cd5cd23..3352fdbd5e20 100644 +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -2499,7 +2499,7 @@ int sysctl_max_threads(struct ctl_table *table, int write, + struct ctl_table t; + int ret; + int threads = max_threads; +- int min = MIN_THREADS; ++ int min = 1; + int max = MAX_THREADS; + + t = *table; +@@ -2511,7 +2511,7 @@ int sysctl_max_threads(struct ctl_table *table, int write, + if (ret || !write) + return ret; + +- set_max_threads(threads); ++ max_threads = threads; + + return 0; + } +diff --git a/kernel/panic.c b/kernel/panic.c +index 32ff6fd30201..207ceac3a432 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -146,6 +146,7 @@ void panic(const char *fmt, ...) + * after setting panic_cpu) from invoking panic() again. + */ + local_irq_disable(); ++ preempt_disable_notrace(); + + /* + * It's possible to come here directly from a panic-assertion and +diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c +index 10b3e3b22af6..144d982905fc 100644 +--- a/kernel/trace/ftrace.c ++++ b/kernel/trace/ftrace.c +@@ -3629,21 +3629,22 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag, + struct ftrace_hash *hash; + struct list_head *mod_head; + struct trace_array *tr = ops->private; +- int ret = 0; ++ int ret = -ENOMEM; + + ftrace_ops_init(ops); + + if (unlikely(ftrace_disabled)) + return -ENODEV; + ++ if (tr && trace_array_get(tr) < 0) ++ return -ENODEV; ++ + iter = kzalloc(sizeof(*iter), GFP_KERNEL); + if (!iter) +- return -ENOMEM; ++ goto out; + +- if (trace_parser_get_init(&iter->parser, FTRACE_BUFF_MAX)) { +- kfree(iter); +- return -ENOMEM; +- } ++ if (trace_parser_get_init(&iter->parser, FTRACE_BUFF_MAX)) ++ goto out; + + iter->ops = ops; + iter->flags = flag; +@@ -3673,13 +3674,13 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag, + + if (!iter->hash) { + trace_parser_put(&iter->parser); +- kfree(iter); +- ret = -ENOMEM; + goto out_unlock; + } + } else + iter->hash = hash; + ++ ret = 0; ++ + if (file->f_mode & FMODE_READ) { + iter->pg = ftrace_pages_start; + +@@ -3691,7 +3692,6 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag, + /* Failed */ + free_ftrace_hash(iter->hash); + trace_parser_put(&iter->parser); +- kfree(iter); + } + } else + file->private_data = iter; +@@ -3699,6 +3699,13 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag, + out_unlock: + mutex_unlock(&ops->func_hash->regex_lock); + ++ out: ++ if (ret) { ++ kfree(iter); ++ if (tr) ++ trace_array_put(tr); ++ } ++ + return ret; + } + +@@ -5098,6 +5105,8 @@ int ftrace_regex_release(struct inode *inode, struct file *file) + + mutex_unlock(&iter->ops->func_hash->regex_lock); + free_ftrace_hash(iter->hash); ++ if (iter->tr) ++ trace_array_put(iter->tr); + kfree(iter); + + return 0; +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index 91227e339ef6..bbe5a857c082 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -4152,9 +4152,14 @@ static int show_traces_open(struct inode *inode, struct file *file) + if (tracing_disabled) + return -ENODEV; + ++ if (trace_array_get(tr) < 0) ++ return -ENODEV; ++ + ret = seq_open(file, &show_traces_seq_ops); +- if (ret) ++ if (ret) { ++ trace_array_put(tr); + return ret; ++ } + + m = file->private_data; + m->private = tr; +@@ -4162,6 +4167,14 @@ static int show_traces_open(struct inode *inode, struct file *file) + return 0; + } + ++static int show_traces_release(struct inode *inode, struct file *file) ++{ ++ struct trace_array *tr = inode->i_private; ++ ++ trace_array_put(tr); ++ return seq_release(inode, file); ++} ++ + static ssize_t + tracing_write_stub(struct file *filp, const char __user *ubuf, + size_t count, loff_t *ppos) +@@ -4192,8 +4205,8 @@ static const struct file_operations tracing_fops = { + static const struct file_operations show_traces_fops = { + .open = show_traces_open, + .read = seq_read, +- .release = seq_release, + .llseek = seq_lseek, ++ .release = show_traces_release, + }; + + static ssize_t +diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c +index d7c8e4ec3d9d..bff6c033d70e 100644 +--- a/kernel/trace/trace_hwlat.c ++++ b/kernel/trace/trace_hwlat.c +@@ -152,7 +152,7 @@ void trace_hwlat_callback(bool enter) + if (enter) + nmi_ts_start = time_get(); + else +- nmi_total_ts = time_get() - nmi_ts_start; ++ nmi_total_ts += time_get() - nmi_ts_start; + } + + if (enter) +@@ -258,6 +258,8 @@ static int get_sample(void) + /* Keep a running maximum ever recorded hardware latency */ + if (sample > tr->max_latency) + tr->max_latency = sample; ++ if (outer_sample > tr->max_latency) ++ tr->max_latency = outer_sample; + } + + out: +diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c +index 36483db032e8..3f02a5e284b2 100644 +--- a/tools/perf/util/jitdump.c ++++ b/tools/perf/util/jitdump.c +@@ -394,7 +394,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr) + size_t size; + u16 idr_size; + const char *sym; +- uint32_t count; ++ uint64_t count; + int ret, csize, usize; + pid_t pid, tid; + struct { +@@ -417,7 +417,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr) + return -1; + + filename = event->mmap2.filename; +- size = snprintf(filename, PATH_MAX, "%s/jitted-%d-%u.so", ++ size = snprintf(filename, PATH_MAX, "%s/jitted-%d-%" PRIu64 ".so", + jd->dir, + pid, + count); +@@ -530,7 +530,7 @@ static int jit_repipe_code_move(struct jit_buf_desc *jd, union jr_entry *jr) + return -1; + + filename = event->mmap2.filename; +- size = snprintf(filename, PATH_MAX, "%s/jitted-%d-%"PRIu64, ++ size = snprintf(filename, PATH_MAX, "%s/jitted-%d-%" PRIu64 ".so", + jd->dir, + pid, + jr->move.code_index); +diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c +index 2bdaac048a0a..da59a9e9543b 100644 +--- a/tools/perf/util/llvm-utils.c ++++ b/tools/perf/util/llvm-utils.c +@@ -225,14 +225,14 @@ static int detect_kbuild_dir(char **kbuild_dir) + const char *prefix_dir = ""; + const char *suffix_dir = ""; + ++ /* _UTSNAME_LENGTH is 65 */ ++ char release[128]; ++ + char *autoconf_path; + + int err; + + if (!test_dir) { +- /* _UTSNAME_LENGTH is 65 */ +- char release[128]; +- + err = fetch_kernel_version(NULL, release, + sizeof(release)); + if (err) |