Linux 3.0.82
Greg KH
maintainerI'm announcing the release of the 3.0.82 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 - drivers/acpi/video.c | 16 ++++++++++ drivers/gpu/drm/drm_irq.c | 6 +++ drivers/gpu/drm/i915/intel_sdvo.c | 2 - drivers/hwmon/adm1021.c | 58 ++++++++++++++++++++++++++++++++------ drivers/usb/host/ehci-sched.c | 2 - drivers/usb/serial/ark3116.c | 2 - drivers/usb/serial/cypress_m8.c | 18 +++++++++++ drivers/usb/serial/cypress_m8.h | 4 ++ drivers/usb/serial/ftdi_sio.c | 4 ++ drivers/usb/serial/iuu_phoenix.c | 4 +- drivers/usb/serial/keyspan.c | 2 - drivers/usb/serial/mos7720.c | 25 +++++++++++----- drivers/usb/serial/option.c | 2 + drivers/usb/serial/visor.c | 1 drivers/usb/serial/whiteheat.c | 2 - kernel/trace/ftrace.c | 34 +++++++++++----------- sound/usb/quirks-table.h | 8 ++++- 18 files changed, 149 insertions(+), 43 deletions(-)
Alan Stern (1):
USB: revert periodic scheduling bugfix
Alex Hung (1):
ACPI / video: ignore BIOS initial backlight value for HP m4
Andrew Worsley (1):
USB: serial: ftdi_sio: Handle the old_termios == 0 case e.g. uart_resume_port()
Ash Willis (1):
ACPI / video: ignore BIOS initial backlight value for HP Pavilion g6
Bjørn Mork (1):
USB: option: blacklist network interface on Huawei E1820
Egbert Eich (1):
drm/i915/sdvo: Use &intel_sdvo->ddc instead of intel_sdvo->i2c for DDC.
Greg Kroah-Hartman (1):
Linux 3.0.82
Guenter Roeck (1):
hwmon: (adm1021) Strengthen chip detection for ADM1021, LM84 and MAX1617
Huacai Chen (1):
drm: fix a use-after-free when GPU acceleration disabled
Johan Hovold (8):
USB: iuu_phoenix: fix bulk-message timeout
USB: keyspan: fix bogus array index
USB: ark3116: fix control-message timeout
USB: whiteheat: fix broken port configuration
USB: serial: fix Treo/Kyocera interrrupt-in urb context
USB: mos7720: fix DMA to stack
USB: mos7720: fix message timeouts
USB: mos7720: fix hardware flow control
Namhyung Kim (1):
tracing: Fix possible NULL pointer dereferences
Robert Butora (1):
USB: Serial: cypress_M8: Enable FRWD Dongle hidcom device
Steven Rostedt (1):
ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section
Takashi Iwai (1):
ALSA: usb-audio - Apply Logitech QuickCam Pro 9000 quirk only to audio iface
Ying Xue (1):
USB: ftdi_sio: Quiet sparse noise about using plain integer was NULL pointer
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 81 +SUBLEVEL = 82 EXTRAVERSION = NAME = Sneaky Weasel
drivers/acpi/video.c +16 -0
@@ -448,6 +448,22 @@ static struct dmi_system_id video_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13 - 2000 Notebook PC"), }, }, + { + .callback = video_ignore_initial_backlight, + .ident = "HP Pavilion g6 Notebook PC", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion g6 Notebook PC"), + }, + }, + { + .callback = video_ignore_initial_backlight, + .ident = "HP Pavilion m4", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion m4 Notebook PC"), + }, + }, {} };
drivers/gpu/drm/drm_irq.c +5 -1
@@ -976,7 +976,7 @@ EXPORT_SYMBOL(drm_vblank_off);*/ void drm_vblank_pre_modeset (struct drm_device *dev,int crtc) { -/* vblank is not initialized (IRQ not installed ?) */ +/* vblank is not initialized (IRQ not installed ?), or has been freed */ if (!dev->num_crtcs)return ;/*
@@ -998,6 +998,10 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc) {unsigned long irqflags; +/* vblank is not initialized (IRQ not installed ?), or has been freed */ +if (!dev->num_crtcs) +return ; +if (dev->vblank_inmodeset[crtc]) {spin_lock_irqsave (&dev->vbl_lock, irqflags); dev->vblank_disable_allowed =1 ;
drivers/gpu/drm/i915/intel_sdvo.c +1 -1
@@ -1609,7 +1609,7 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)* Assume that the preferred modes are * arranged in priority order. */ -intel_ddc_get_modes (connector, intel_sdvo->i2c); +intel_ddc_get_modes (connector, &intel_sdvo->ddc);if (list_empty (&connector->probed_modes) == false) goto end;
drivers/hwmon/adm1021.c +50 -8
76 lines not on this page · raw message
drivers/usb/host/ehci-sched.c +1 -1
@@ -236,7 +236,7 @@ static inline unsigned char tt_start_uframe(struct ehci_hcd *ehci, __hc32 mask) }static const unsigned char -max_tt_usecs[] = {125 ,125 ,125 ,125 ,125 ,125 ,125 ,25 }; +max_tt_usecs[] = {125 ,125 ,125 ,125 ,125 ,125 ,30 ,0 };/* carryover low/fullspeed bandwidth that crosses uframe boundries */ static inline void carryover_tt_bandwidth (unsigned short tt_usecs[8 ])
drivers/usb/serial/ark3116.c +1 -1
@@ -49,7 +49,7 @@ static int debug;#define DRIVER_NAME "ark3116"/* usb timeout of 1 second */ -#define ARK_TIMEOUT (1*HZ) +#define ARK_TIMEOUT 1000static const struct usb_device_id id_table[] = { {USB_DEVICE (0x6547 ,0x0232 ) },
drivers/usb/serial/cypress_m8.c +17 -1
@@ -96,6 +96,7 @@ static const struct usb_device_id id_table_earthmate[] = {static const struct usb_device_id id_table_cyphidcomrs232[] = { {USB_DEVICE (VENDOR_ID_CYPRESS ,PRODUCT_ID_CYPHIDCOM ) }, {USB_DEVICE (VENDOR_ID_POWERCOM ,PRODUCT_ID_UPS ) }, + {USB_DEVICE (VENDOR_ID_FRWD ,PRODUCT_ID_CYPHIDCOM_FRWD ) }, { }/* Terminating entry */ };
@@ -109,6 +110,7 @@ static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(VENDOR_ID_DELORME, PRODUCT_ID_EARTHMATEUSB_LT20) }, { USB_DEVICE(VENDOR_ID_CYPRESS, PRODUCT_ID_CYPHIDCOM) }, { USB_DEVICE(VENDOR_ID_POWERCOM, PRODUCT_ID_UPS) }, + { USB_DEVICE(VENDOR_ID_FRWD, PRODUCT_ID_CYPHIDCOM_FRWD) }, { USB_DEVICE(VENDOR_ID_DAZZLE, PRODUCT_ID_CA42) }, { } /* Terminating entry */ };
@@ -268,6 +270,12 @@ static struct usb_serial_driver cypress_ca42v2_device = {* Cypress serial helper functions *****************************************************************************/ +/* FRWD Dongle hidcom needs to skip reset and speed checks */ +static inline bool is_frwd (struct usb_device *dev) +{ +return ((le16_to_cpu (dev->descriptor.idVendor) ==VENDOR_ID_FRWD ) && + (le16_to_cpu (dev->descriptor.idProduct) ==PRODUCT_ID_CYPHIDCOM_FRWD )); +}static int analyze_baud_rate (struct usb_serial_port *port,speed_t new_rate) {
@@ -277,6 +285,10 @@ static int analyze_baud_rate(struct usb_serial_port *port, speed_t new_rate)if (unstable_bauds)return new_rate; +/* FRWD Dongle uses 115200 bps */ +if (is_frwd (port->serial->dev)) +return new_rate; +/* * The general purpose firmware for the Cypress M8 allows for * a maximum speed of 57600bps (I have no idea whether DeLorme
@@ -490,7 +502,11 @@ static int generic_startup(struct usb_serial *serial) }init_waitqueue_head (&priv->delta_msr_wait); -usb_reset_configuration (serial->dev); +/* Skip reset for FRWD device. It is a workaound: +device hangs if it receives SET_CONFIGURE in Configured +state. */ +if (!is_frwd (serial->dev)) +usb_reset_configuration (serial->dev); priv->cmd_ctrl =0 ; priv->line_control =0 ;
drivers/usb/serial/cypress_m8.h +4 -0
@@ -24,6 +24,10 @@#define VENDOR_ID_CYPRESS 0x04b4#define PRODUCT_ID_CYPHIDCOM 0x5500 +/* FRWD Dongle - a GPS sports watch */ +#define VENDOR_ID_FRWD 0x6737 +#define PRODUCT_ID_CYPHIDCOM_FRWD 0x0001 +/* Powercom UPS, chip CY7C63723 */ #define VENDOR_ID_POWERCOM 0x0d9f#define PRODUCT_ID_UPS 0x0002
drivers/usb/serial/ftdi_sio.c +4 -0
@@ -2141,6 +2141,9 @@ static void ftdi_set_termios(struct tty_struct *tty, cflag = termios->c_cflag; +if (!old_termios) + goto no_skip; +if (old_termios->c_cflag == termios->c_cflag && old_termios->c_ispeed == termios->c_ispeed && old_termios->c_ospeed == termios->c_ospeed)
@@ -2154,6 +2157,7 @@ static void ftdi_set_termios(struct tty_struct *tty, (termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB))) goto no_data_parity_stop_changes; +no_skip:/* Set number of data bits, parity, stop bits */ urb_value =0 ;
drivers/usb/serial/iuu_phoenix.c +2 -2
@@ -327,7 +327,7 @@ static int bulk_immediate(struct usb_serial_port *port, u8 *buf, u8 count)usb_bulk_msg (serial->dev,usb_sndbulkpipe (serial->dev, port->bulk_out_endpointAddress), buf, - count, &actual,HZ *1 ); + count, &actual,1000 );if (status !=IUU_OPERATION_OK )dbg ("%s - error = %2x" , __func__, status);
@@ -350,7 +350,7 @@ static int read_immediate(struct usb_serial_port *port, u8 *buf, u8 count)usb_bulk_msg (serial->dev,usb_rcvbulkpipe (serial->dev, port->bulk_in_endpointAddress), buf, - count, &actual,HZ *1 ); + count, &actual,1000 );if (status !=IUU_OPERATION_OK )dbg ("%s - error = %2x" , __func__, status);
drivers/usb/serial/keyspan.c +1 -1
@@ -1833,7 +1833,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial, d_details = s_priv->device_details; device_port = port->number - port->serial->minor; - outcont_urb = d_details->outcont_endpoints[port->number]; + outcont_urb = d_details->outcont_endpoints[device_port]; this_urb = p_priv->outcont_urb;dbg ("%s - endpoint %d" , __func__,usb_pipeendpoint (this_urb->pipe));
drivers/usb/serial/mos7720.c +18 -7
@@ -44,7 +44,7 @@#define DRIVER_DESC "Moschip USB Serial Driver"/* default urb timeout */ -#define MOS_WDR_TIMEOUT (HZ * 5) +#define MOS_WDR_TIMEOUT 5000#define MOS_MAX_PORT 0x02#define MOS_WRITE 0x0E
@@ -234,11 +234,22 @@ static int read_mos_reg(struct usb_serial *serial, unsigned int serial_portnum,__u8 requesttype = (__u8 )0xc0 ;__u16 index =get_reg_index (reg);__u16 value =get_reg_value (reg, serial_portnum); -int status =usb_control_msg (usbdev, pipe, request, requesttype, value, - index, data,1 ,MOS_WDR_TIMEOUT ); -if (status <0 ) +u8 *buf; +int status; + + buf =kmalloc (1 ,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + status =usb_control_msg (usbdev, pipe, request, requesttype, value, + index, buf,1 ,MOS_WDR_TIMEOUT ); +if (status ==1 ) + *data = *buf; +else if (status <0 )dev_err (&usbdev->dev,"mos7720: usb_control_msg() failed: %d" , status); +kfree (buf); +return status; }
@@ -1700,7 +1711,7 @@ static void change_port_settings(struct tty_struct *tty, mos7720_port->shadowMCR |= (UART_MCR_XONANY );/* To set hardware flow control to the specified * * serial port, in SP1/2_CONTROL_REG */ -if (port->number) +if (port_number)write_mos_reg (serial, dummy,SP_CONTROL_REG ,0x01 );else write_mos_reg (serial, dummy,SP_CONTROL_REG ,0x02 );
@@ -2113,7 +2124,7 @@ static int mos7720_startup(struct usb_serial *serial)/* setting configuration feature to one */ usb_control_msg (serial->dev,usb_sndctrlpipe (serial->dev,0 ), - (__u8 )0x03 ,0x00 ,0x01 ,0x00 ,NULL ,0x00 ,5 *HZ ); + (__u8 )0x03 ,0x00 ,0x01 ,0x00 ,NULL ,0x00 ,5000 );/* start the interrupt urb */ ret_val =usb_submit_urb (serial->port[0 ]->interrupt_in_urb,GFP_KERNEL );
@@ -2158,7 +2169,7 @@ static void mos7720_release(struct usb_serial *serial)/* wait for synchronous usb calls to return */ if (mos_parport->msg_pending)wait_for_completion_timeout (&mos_parport->syncmsg_compl, -MOS_WDR_TIMEOUT ); +msecs_to_jiffies (MOS_WDR_TIMEOUT ));parport_remove_port (mos_parport->pp);usb_set_serial_data (serial,NULL );
drivers/usb/serial/option.c +2 -0
@@ -593,6 +593,8 @@ static const struct usb_device_id option_ids[] = { .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x14ac, 0xff, 0xff, 0xff), /* Huawei E1820 */ + .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0xff, 0xff) },
drivers/usb/serial/visor.c +1 -0
@@ -600,6 +600,7 @@ static int treo_attach(struct usb_serial *serial) dest->bulk_in_endpointAddress = src->bulk_in_endpointAddress;\ dest->bulk_in_buffer = src->bulk_in_buffer; \ dest->interrupt_in_urb = src->interrupt_in_urb; \ + dest->interrupt_in_urb->context = dest; \ dest->interrupt_in_endpointAddress = \ src->interrupt_in_endpointAddress;\ dest->interrupt_in_buffer = src->interrupt_in_buffer; \
drivers/usb/serial/whiteheat.c +1 -1
@@ -1209,7 +1209,7 @@ static void firm_setup_port(struct tty_struct *tty)struct whiteheat_port_settings port_settings;unsigned int cflag = tty->termios->c_cflag; - port_settings.port = port->number +1 ; + port_settings.port = port->number - port->serial->minor +1 ;/* get the byte size */ switch (cflag &CSIZE ) {
kernel/trace/ftrace.c +17 -17
@@ -933,6 +933,19 @@ static __init void ftrace_profile_debugfs(struct dentry *d_tracer)static struct pid *const ftrace_swapper_pid = &init_struct_pid; +static loff_t +ftrace_filter_lseek (struct file *file,loff_t offset,int whence) +{ +loff_t ret; + +if (file->f_mode &FMODE_READ ) + ret =seq_lseek (file, offset, whence); +else + file->f_pos = ret =1 ; + +return ret; +} +#ifdef CONFIG_DYNAMIC_FTRACE #ifndef CONFIG_FTRACE_MCOUNT_RECORD
@@ -2299,19 +2312,6 @@ ftrace_notrace_open(struct inode *inode, struct file *file) inode, file); } -static loff_t -ftrace_regex_lseek (struct file *file,loff_t offset,int origin) -{ -loff_t ret; - -if (file->f_mode &FMODE_READ ) - ret =seq_lseek (file, offset, origin); -else - file->f_pos = ret =1 ; - -return ret; -} -static int ftrace_match (char *str,char *regex,int len,int type) {int matched =0 ;
@@ -3118,7 +3118,7 @@ static const struct file_operations ftrace_filter_fops = { .open = ftrace_filter_open, .read = seq_read, .write = ftrace_filter_write, - .llseek = ftrace_regex_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_regex_release, };
@@ -3126,7 +3126,7 @@ static const struct file_operations ftrace_notrace_fops = { .open = ftrace_notrace_open, .read = seq_read, .write = ftrace_notrace_write, - .llseek = ftrace_regex_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_regex_release, };
@@ -3335,8 +3335,8 @@ static const struct file_operations ftrace_graph_fops = { .open = ftrace_graph_open, .read = seq_read, .write = ftrace_graph_write, + .llseek = ftrace_filter_lseek, .release = ftrace_graph_release, - .llseek = seq_lseek, };#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
@@ -3822,7 +3822,7 @@ static const struct file_operations ftrace_pid_fops = { .open = ftrace_pid_open, .write = ftrace_pid_write, .read = seq_read, - .llseek = seq_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_pid_release, };
sound/usb/quirks-table.h +7 -1
@@ -146,7 +146,13 @@ .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL }, { - USB_DEVICE(0x046d, 0x0990), + .match_flags =USB_DEVICE_ID_MATCH_DEVICE | +USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x0990, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { .vendor_name ="Logitech, Inc." , .product_name ="QuickCam Pro 9000" ,