Linux 3.10.48
Greg KH
maintainerI'm announcing the release of the 3.10.48 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.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 arch/arm/mach-omap2/mux.c | 6 +- arch/arm64/kernel/entry.S | 1 arch/unicore32/mm/alignment.c | 1 arch/x86/include/asm/kvm_host.h | 4 - drivers/block/rbd.c | 19 +++++++ drivers/gpu/drm/radeon/atombios_crtc.c | 48 ++++++++++-------- drivers/gpu/drm/radeon/atombios_dp.c | 17 +++++- drivers/gpu/drm/radeon/atombios_encoders.c | 5 + drivers/gpu/drm/radeon/radeon_connectors.c | 2 drivers/gpu/drm/radeon/radeon_cs.c | 6 ++ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 drivers/hwmon/ina2xx.c | 7 +- drivers/iio/inkern.c | 6 +- drivers/irqchip/spear-shirq.c | 2 drivers/md/dm-thin.c | 3 - drivers/md/md.c | 13 +++++ drivers/mmc/host/rtsx_pci_sdmmc.c | 3 + drivers/mtd/nand/fsl_elbc_nand.c | 14 +++++ drivers/mtd/nand/omap2.c | 2 drivers/net/wireless/b43/xmit.c | 10 ++- drivers/net/wireless/iwlwifi/pcie/trans.c | 26 ++++++---- drivers/net/wireless/rt2x00/rt2500pci.c | 7 ++ drivers/net/wireless/rt2x00/rt2x00.h | 1 drivers/net/wireless/rt2x00/rt2x00dev.c | 24 ++++++++- drivers/net/wireless/rt2x00/rt2x00mac.c | 2 drivers/scsi/ibmvscsi/ibmvscsi.c | 13 ++++- drivers/scsi/sym53c8xx_2/sym_hipd.c | 4 + drivers/scsi/virtio_scsi.c | 26 +++++++++- drivers/tty/serial/8250/8250_dw.c | 74 ++++++++++++++++++++++------- drivers/usb/gadget/f_fs.c | 12 ++-- drivers/usb/host/xhci-ring.c | 2 drivers/usb/host/xhci.c | 10 ++- drivers/usb/serial/ftdi_sio.c | 7 +- drivers/usb/serial/option.c | 26 +++++++--- drivers/video/fb-puv3.c | 2 fs/cifs/cifs_unicode.c | 7 +- fs/ext4/indirect.c | 20 ++++++- fs/nfsd/nfs4proc.c | 9 --- fs/nfsd/nfs4xdr.c | 13 ++++- kernel/trace/trace.c | 2 mm/hugetlb.c | 71 ++++++++++++++++----------- mm/mempolicy.c | 46 +++++++----------- net/bluetooth/hci_conn.c | 2 net/bluetooth/hci_event.c | 7 +- net/bluetooth/mgmt.c | 7 ++ net/mac80211/debugfs_netdev.c | 6 -- net/mac80211/sta_info.c | 1 sound/usb/pcm.c | 3 - tools/usb/ffs-test.c | 4 - 50 files changed, 429 insertions(+), 177 deletions(-)
Adam Thomson (1):
iio: of_iio_channel_get_by_name() returns non-null pointers for error legs
Alex Deucher (4):
drm/radeon: only apply hdmi bpc pll flags when encoder mode is hdmi drm/radeon: fix typo in radeon_connector_is_dp12_capable() drm/radeon/dp: fix lane/clock setup for dp 1.2 capable devices drm/radeon/atom: fix dithering on certain panels
Alex Elder (1):
rbd: use reference counts for image requests
Arik Nemtsov (1):
mac80211: don't check netdev state for debugfs read/write
Bjørn Mork (1):
usb: option: add/modify Olivetti Olicard modems
Brian King (2):
ibmvscsi: Abort init sequence during error recovery
ibmvscsi: Add memory barriers for send / receive
Chen Gang (1):
arch/unicore32/mm/alignment.c: include "asm/pgtable.h" to avoid compiling error
ChiaHao (1):
arm64: Bug fix in stack alignment exception
David R. Piegdon (1):
ARM: OMAP2+: Fix parser-bug in platform muxing code
Emmanuel Grumbach (1):
iwlwifi: pcie: try to get ownership several times
Fabio Baltieri (1):
hwmon: (ina2xx) Cast to s16 on shunt and current regs
Felix Fietkau (1):
mac80211: fix a memory leak on sta rate selection table
Greg Kroah-Hartman (1):
Linux 3.10.48
Hugh Dickins (1):
mm: fix crashes from mbind() merging vmas
Ilya Dryomov (1):
rbd: handle parent_overlap on writes correctly
J. Bruce Fields (1):
nfsd: fix rare symlink decoding bug
James Hogan (1):
serial: 8250_dw: Fix LCR workaround regression
Jan Kara (2):
ext4: Fix buffer double free in ext4_alloc_branch()
ext4: Fix hole punching for files with indirect blocks
Johan Hedberg (3):
Bluetooth: Fix SSP acceptor just-works confirmation without MITM
Bluetooth: Fix check for connection encryption
Bluetooth: Fix locking of hdev when calling into SMP code
Johan Hovold (1):
USB: ftdi_sio: fix null deref at port probe
Lukas Czerner (1):
dm thin: update discard_granularity to reflect the thin-pool blocksize
Marek Olšák (1):
drm/radeon: don't allow RADEON_GEM_DOMAIN_CPU for command submission
Mathias Nyman (1):
xhci: correct burst count field for isoc transfers on 1.0 xhci hosts
Michal Nazarewicz (2):
usb: gadget: f_fs: fix NULL pointer dereference when there are no strings
tools: ffs-test: fix header values endianess
Micky Ching (1):
mmc: rtsx: add R1-no-CRC mmc command type handle
Mikulas Patocka (1):
sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue
Nadav Amit (1):
KVM: x86: Increase the number of fixed MTRR regs to 10
Naoya Horiguchi (1):
hugetlb: fix copy_hugetlb_page_range() to handle migration/hwpoisoned entry
NeilBrown (1):
md: flush writes before starting a recovery.
Oliver Neukum (1):
USB: option: add device ID for SpeedUp SU9800 usb 3g modem
Paolo Bonzini (3):
virtio-scsi: avoid cancelling uninitialized work items
virtio-scsi: fix various bad behavior on aborted requests
KVM: x86: preserve the high 32-bits of the PAT register
Pekon Gupta (1):
mtd: eLBC NAND: fix subpage write support
Rafał Miłecki (1):
b43: fix frequency reported on G-PHY with /new/ firmware
Sander Eikelenboom (1):
ALSA: usb-audio: Prevent printk ratelimiting from spamming kernel log while DEBUG not defined
Stanislaw Gruszka (2):
rt2x00: disable TKIP on USB
rt2x00: fix rfkill regression on rt2500pci
Steve French (1):
CIFS: fix mount failure with broken pathnames when smb3 mount with mapchars option
Steven Rostedt (Red Hat) (1):
tracing: Remove ftrace_stop/start() from reading the trace file
Thomas Gleixner (1):
irqchip: spear_shirq: Fix interrupt offset
Thomas Hellstrom (1):
drm/vmwgfx: Fix incorrect write to read-only register v2:
Tim Gardner (1):
ALSA: usb-audio: Suppress repetitive debug messages from retire_playback_urb()
Tim Kryger (2):
serial: 8250_dw: Report CTS asserted for auto flow
serial: 8250_dw: Improve unwritable LCR workaround
Wang, Yu (1):
xhci: Fix runtime suspended xhci from blocking system suspend.
Zhichuang SUN (1):
drivers/video/fbdev/fb-puv3.c: Add header files for function unifb_mmap
pekon gupta (1):
mtd: nand: omap: fix BCHx ecc.correct to return detected bit-flips in erased-page
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 47 +SUBLEVEL = 48 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm/mach-omap2/mux.c +4 -2
@@ -183,8 +183,10 @@ static int __init _omap_mux_get_by_name(struct omap_mux_partition *partition, m0_entry = mux->muxnames[0 ];/* First check for full name in mode0.muxmode format */ -if (mode0_len &&strncmp (muxname, m0_entry, mode0_len)) -continue ; +if (mode0_len) +if (strncmp (muxname, m0_entry, mode0_len) || + (strlen (m0_entry) != mode0_len)) +continue ;/* Then check for muxmode only */ for (i =0 ; i <OMAP_MUX_NR_MODES ; i++) {
arch/arm64/kernel/entry.S +0 -1
@@ -275,7 +275,6 @@ el1_sp_pc: * Stack or PC alignment exception handling */ mrs x0, far_el1 - mov x1, x25 mov x2, sp b do_sp_pc_abort el1_undef:
arch/unicore32/mm/alignment.c +1 -0
@@ -21,6 +21,7 @@#include <linux/sched.h> #include <linux/uaccess.h> +#include <asm/pgtable.h> #include <asm/tlbflush.h> #include <asm/unaligned.h>
arch/x86/include/asm/kvm_host.h +2 -2
@@ -92,7 +92,7 @@#define KVM_REFILL_PAGES 25#define KVM_MAX_CPUID_ENTRIES 80#define KVM_NR_FIXED_MTRR_REGION 88 -#define KVM_NR_VAR_MTRR 8 +#define KVM_NR_VAR_MTRR 10#define ASYNC_PF_PER_VCPU 64
@@ -445,7 +445,7 @@ struct kvm_vcpu_arch {bool nmi_injected;/* Trying to inject an NMI this entry */ struct mtrr_state_type mtrr_state; -u32 pat; +u64 pat;int switch_db_regs;unsigned long db[KVM_NR_DB_REGS ];
drivers/block/rbd.c +18 -1
@@ -1385,6 +1385,14 @@ static bool obj_request_exists_test(struct rbd_obj_request *obj_request)return test_bit (OBJ_REQ_EXISTS , &obj_request->flags) !=0 ; } +static bool obj_request_overlaps_parent (struct rbd_obj_request *obj_request) +{ +struct rbd_device *rbd_dev = obj_request->img_request->rbd_dev; + +return obj_request->img_offset < +round_up (rbd_dev->parent_overlap,rbd_obj_bytes (&rbd_dev->header)); +} +static void rbd_obj_request_get (struct rbd_obj_request *obj_request) { dout("%s: obj %p (was %d)\n", __func__, obj_request,
@@ -1401,6 +1409,13 @@ static void rbd_obj_request_put(struct rbd_obj_request *obj_request)kref_put (&obj_request->kref, rbd_obj_request_destroy); } +static void rbd_img_request_get (struct rbd_img_request *img_request) +{ +dout ("%s: img %p (was %d)\n" , __func__, img_request, +atomic_read (&img_request->kref.refcount)); +kref_get (&img_request->kref); +} +static bool img_request_child_test (struct rbd_img_request *img_request);static void rbd_parent_request_destroy (struct kref *kref);static void rbd_img_request_destroy (struct kref *kref);
@@ -2154,6 +2169,7 @@ static void rbd_img_obj_callback(struct rbd_obj_request *obj_request) img_request->next_completion = which; out:spin_unlock_irq (&img_request->completion_lock); +rbd_img_request_put (img_request);if (!more)rbd_img_request_complete (img_request);
@@ -2250,6 +2266,7 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request, goto out_partial; obj_request->osd_req = osd_req; obj_request->callback = rbd_img_obj_callback; +rbd_img_request_get (img_request);osd_req_op_extent_init (osd_req,0 , opcode, offset, length,0 ,0 );
@@ -2673,7 +2690,7 @@ static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request)*/ if (!img_request_write_test (img_request) || !img_request_layered_test (img_request) || - rbd_dev->parent_overlap <= obj_request->img_offset || + !obj_request_overlaps_parent (obj_request) || ((known =obj_request_known_test (obj_request)) &&obj_request_exists_test (obj_request))) {
drivers/gpu/drm/radeon/atombios_crtc.c +26 -22
60 lines not on this page · raw message
drivers/gpu/drm/radeon/atombios_dp.c +15 -2
@@ -384,6 +384,19 @@ static int dp_get_max_dp_pix_clock(int link_rate,/***** radeon specific DP functions *****/ +static int radeon_dp_get_max_link_rate (struct drm_connector *connector, +u8 dpcd[DP_DPCD_SIZE ]) +{ +int max_link_rate; + +if (radeon_connector_is_dp12_capable (connector)) + max_link_rate =min (drm_dp_max_link_rate (dpcd),540000 ); +else + max_link_rate =min (drm_dp_max_link_rate (dpcd),270000 ); + +return max_link_rate; +} +/* First get the min lane# when low rate is used according to pixel clock * (prefer low rate), second check max lane# supported by DP panel, * if the max lane# < low rate lane# then use max lane# instead.
@@ -393,7 +406,7 @@ static int radeon_dp_get_dp_lane_number(struct drm_connector *connector, int pix_clock) {int bpp =convert_bpc_to_bpp (radeon_get_monitor_bpc (connector)); -int max_link_rate =drm_dp_max_link_rate (dpcd); +int max_link_rate =radeon_dp_get_max_link_rate (connector, dpcd);int max_lane_num =drm_dp_max_lane_count (dpcd);int lane_num;int max_dp_pix_clock;
@@ -431,7 +444,7 @@ static int radeon_dp_get_dp_link_clock(struct drm_connector *connector,return 540000 ; } -return drm_dp_max_link_rate (dpcd); +return radeon_dp_get_max_link_rate (connector, dpcd); } static u8 radeon_dp_encoder_service(struct radeon_device *rdev,
drivers/gpu/drm/radeon/atombios_encoders.c +4 -1
@@ -1877,8 +1877,11 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder) args.v2.ucEncodeMode =ATOM_ENCODER_MODE_CRT ; else args.v2.ucEncodeMode = atombios_get_encoder_mode(encoder); - }else + }else if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { + args.v2.ucEncodeMode =ATOM_ENCODER_MODE_LVDS ; + }else { args.v2.ucEncodeMode =atombios_get_encoder_mode (encoder); + }switch (radeon_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_UNIPHY :case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 :
drivers/gpu/drm/radeon/radeon_connectors.c +1 -1
@@ -1345,7 +1345,7 @@ bool radeon_connector_is_dp12_capable(struct drm_connector *connector)struct radeon_device *rdev = dev->dev_private;if (ASIC_IS_DCE5 (rdev) && - (rdev->clock.dp_extclk >=53900 ) && + (rdev->clock.default_dispclk >=53900 ) &&radeon_connector_encoder_is_hbr2 (connector)) {return true; }
drivers/gpu/drm/radeon/radeon_cs.c +6 -0
@@ -96,6 +96,12 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)uint32_t domain = r->write_domain ? r->write_domain : r->read_domains; +if (domain &RADEON_GEM_DOMAIN_CPU ) { +DRM_ERROR ("RADEON_GEM_DOMAIN_CPU is not valid " +"for command submission\n" ); +return -EINVAL ; + } + p->relocs[i].lobj.domain = domain;if (domain ==RADEON_GEM_DOMAIN_VRAM ) domain |=RADEON_GEM_DOMAIN_GTT ;
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +0 -1
@@ -179,7 +179,6 @@ static int vmw_fb_set_par(struct fb_info *info)vmw_write (vmw_priv,SVGA_REG_DISPLAY_POSITION_Y , info->var.yoffset);vmw_write (vmw_priv,SVGA_REG_DISPLAY_WIDTH , info->var.xres);vmw_write (vmw_priv,SVGA_REG_DISPLAY_HEIGHT , info->var.yres); -vmw_write (vmw_priv,SVGA_REG_BYTES_PER_LINE , info->fix.line_length);vmw_write (vmw_priv,SVGA_REG_DISPLAY_ID ,SVGA_ID_INVALID ); }
drivers/hwmon/ina2xx.c +4 -3
@@ -147,7 +147,8 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg)switch (reg) {case INA2XX_SHUNT_VOLTAGE : - val =DIV_ROUND_CLOSEST (data->regs[reg], +/* signed register */ + val =DIV_ROUND_CLOSEST ((s16 )data->regs[reg], data->config->shunt_div);break ;case INA2XX_BUS_VOLTAGE :
@@ -159,8 +160,8 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg) val = data->regs[reg] * data->config->power_lsb;break ;case INA2XX_CURRENT : -/* LSB=1mA (selected). Is in mA */ - val = data->regs[reg]; +/* signed register, LSB=1mA (selected), in mA */ + val = (s16 )data->regs[reg];break ;default :/* programmer goofed */
drivers/iio/inkern.c +4 -2
@@ -183,7 +183,7 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,else if (name && index >=0 ) {pr_err ("ERROR: could not get IIO channel %s:%s(%i)\n" , np->full_name, name ? name :"" , index); -return chan; +return NULL ; }/*
@@ -193,8 +193,9 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,*/ np = np->parent;if (np && !of_get_property (np,"io-channel-ranges" ,NULL )) -break ; +return NULL ; } +return chan; }
@@ -317,6 +318,7 @@ struct iio_channel *iio_channel_get(struct device *dev,if (channel !=NULL )return channel; } +return iio_channel_get_sys (name, channel_name); }EXPORT_SYMBOL_GPL (iio_channel_get);
drivers/irqchip/spear-shirq.c +1 -1
@@ -125,7 +125,7 @@ static struct spear_shirq spear320_shirq_ras2 = { };static struct spear_shirq spear320_shirq_ras3 = { - .irq_nr =3 , + .irq_nr =7 , .irq_bit_off =0 , .invalid_irq =1 , .regs = {
drivers/md/dm-thin.c +2 -1
@@ -2647,7 +2647,8 @@ static void set_discard_limits(struct pool_c *pt, struct queue_limits *limits)*/ if (pt->adjusted_pf.discard_passdown) { data_limits = &bdev_get_queue (pt->data_dev->bdev)->limits; - limits->discard_granularity = data_limits->discard_granularity; + limits->discard_granularity =max (data_limits->discard_granularity, + pool->sectors_per_block <<SECTOR_SHIFT ); }else limits->discard_granularity = pool->sectors_per_block <<SECTOR_SHIFT ; }
drivers/md/md.c +13 -0
@@ -7447,6 +7447,19 @@ void md_do_sync(struct md_thread *thread) rdev->recovery_offset < j) j = rdev->recovery_offset;rcu_read_unlock (); + +/* If there is a bitmap, we need to make sure all +* writes that started before we added a spare +* complete before we start doing a recovery. +* Otherwise the write might complete and (via +* bitmap_endwrite) set a bit in the bitmap after the +* recovery has checked that bit and skipped that +* region. +*/ +if (mddev->bitmap) { + mddev->pers->quiesce (mddev,1 ); + mddev->pers->quiesce (mddev,0 ); + } }printk (KERN_INFO "md: %s of RAID array %s\n" , desc,mdname (mddev));
drivers/mmc/host/rtsx_pci_sdmmc.c +3 -0
@@ -247,6 +247,9 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host,case MMC_RSP_R1 : rsp_type =SD_RSP_TYPE_R1 ;break ; +case MMC_RSP_R1 & ~MMC_RSP_CRC : + rsp_type =SD_RSP_TYPE_R1 |SD_NO_CHECK_CRC7 ; +break ;case MMC_RSP_R1B : rsp_type = SD_RSP_TYPE_R1b;break ;
drivers/mtd/nand/fsl_elbc_nand.c +14 -0
@@ -725,6 +725,19 @@ static int fsl_elbc_write_page(struct mtd_info *mtd, struct nand_chip *chip,return 0 ; } +/* ECC will be calculated automatically, and errors will be detected in +* waitfunc. +*/ +static int fsl_elbc_write_subpage (struct mtd_info *mtd,struct nand_chip *chip, +uint32_t offset,uint32_t data_len, +const uint8_t *buf,int oob_required) +{ +fsl_elbc_write_buf (mtd, buf, mtd->writesize); +fsl_elbc_write_buf (mtd, chip->oob_poi, mtd->oobsize); + +return 0 ; +} +static int fsl_elbc_chip_init (struct fsl_elbc_mtd *priv) {struct fsl_lbc_ctrl *ctrl = priv->ctrl;
@@ -763,6 +776,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv) chip->ecc.read_page = fsl_elbc_read_page; chip->ecc.write_page = fsl_elbc_write_page; + chip->ecc.write_subpage = fsl_elbc_write_subpage;/* If CS Base Register selects full hardware ECC then use it */ if ((in_be32(&lbc->bank[priv->bank].br) & BR_DECC) ==
drivers/mtd/nand/omap2.c +1 -1
@@ -1463,7 +1463,7 @@ static int omap_elm_correct_data(struct mtd_info *mtd, u_char *data,/* Check if any error reported */ if (!is_error_reported) -return 0 ; +return stat;/* Decode BCH error using ELM module */ elm_decode_bch_error_page (info->elm_dev, ecc_vec, err_vec);
drivers/net/wireless/b43/xmit.c +7 -3
@@ -810,9 +810,13 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)break ;case B43_PHYTYPE_G : status.band =IEEE80211_BAND_2GHZ ; -/* chanid is the radio channel cookie value as used -* to tune the radio. */ - status.freq = chanid +2400 ; +/* Somewhere between 478.104 and 508.1084 firmware for G-PHY +* has been modified to be compatible with N-PHY and others. +*/ +if (dev->fw.rev >=508 ) + status.freq =ieee80211_channel_to_frequency (chanid, status.band); +else + status.freq = chanid +2400 ;break ;case B43_PHYTYPE_N :case B43_PHYTYPE_LP :
drivers/net/wireless/iwlwifi/pcie/trans.c +16 -10
@@ -339,6 +339,7 @@ static int iwl_pcie_prepare_card_hw(struct iwl_trans *trans) {int ret;int t =0 ; +int iter;IWL_DEBUG_INFO (trans,"iwl_trans_prepare_card_hw enter\n" );
@@ -347,18 +348,23 @@ static int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)if (ret >=0 )return 0 ; -/* If HW is not ready, prepare the conditions to check again */ -iwl_set_bit (trans,CSR_HW_IF_CONFIG_REG , -CSR_HW_IF_CONFIG_REG_PREPARE ); +for (iter =0 ; iter <10 ; iter++) { +/* If HW is not ready, prepare the conditions to check again */ +iwl_set_bit (trans,CSR_HW_IF_CONFIG_REG , +CSR_HW_IF_CONFIG_REG_PREPARE ); + +do { + ret =iwl_pcie_set_hw_ready (trans); +if (ret >=0 ) +return 0 ; -do { - ret =iwl_pcie_set_hw_ready (trans); -if (ret >=0 ) -return 0 ; +usleep_range (200 ,1000 ); + t +=200 ; + }while (t <150000 ); +msleep (25 ); + } -usleep_range (200 ,1000 ); - t +=200 ; - }while (t <150000 ); +IWL_DEBUG_INFO (trans,"got NIC after %d iterations\n" , iter);return ret; }
drivers/net/wireless/rt2x00/rt2500pci.c +6 -1
@@ -1684,8 +1684,13 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)/* * Detect if this device has an hardware controlled radio. */ -if (rt2x00_get_field16 (eeprom,EEPROM_ANTENNA_HARDWARE_RADIO )) +if (rt2x00_get_field16 (eeprom,EEPROM_ANTENNA_HARDWARE_RADIO )) {__set_bit (CAPABILITY_HW_BUTTON , &rt2x00dev->cap_flags); +/* +* On this device RFKILL initialized during probe does not work. +*/ +__set_bit (REQUIRE_DELAYED_RFKILL , &rt2x00dev->cap_flags); + }/* * Check if the BBP tuning should be enabled.
drivers/net/wireless/rt2x00/rt2x00.h +1 -0
@@ -708,6 +708,7 @@ enum rt2x00_capability_flags {REQUIRE_SW_SEQNO ,REQUIRE_HT_TX_DESC ,REQUIRE_PS_AUTOWAKE , + REQUIRE_DELAYED_RFKILL,/* * Capabilities
drivers/net/wireless/rt2x00/rt2x00dev.c +21 -3
@@ -1128,9 +1128,10 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)return ;/* -* Unregister extra components. +* Stop rfkill polling. */ -rt2x00rfkill_unregister (rt2x00dev); +if (test_bit (REQUIRE_DELAYED_RFKILL , &rt2x00dev->cap_flags)) +rt2x00rfkill_unregister (rt2x00dev);/* * Allow the HW to uninitialize.
@@ -1168,6 +1169,12 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)set_bit (DEVICE_STATE_INITIALIZED , &rt2x00dev->flags); +/* +* Start rfkill polling. +*/ +if (test_bit (REQUIRE_DELAYED_RFKILL , &rt2x00dev->cap_flags)) +rt2x00rfkill_register (rt2x00dev); +return 0 ; }
@@ -1363,7 +1370,12 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)rt2x00link_register (rt2x00dev);rt2x00leds_register (rt2x00dev);rt2x00debug_register (rt2x00dev); -rt2x00rfkill_register (rt2x00dev); + +/* +* Start rfkill polling. +*/ +if (!test_bit (REQUIRE_DELAYED_RFKILL , &rt2x00dev->cap_flags)) +rt2x00rfkill_register (rt2x00dev);return 0 ;
@@ -1379,6 +1391,12 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)clear_bit (DEVICE_STATE_PRESENT , &rt2x00dev->flags);/* +* Stop rfkill polling. +*/ +if (!test_bit (REQUIRE_DELAYED_RFKILL , &rt2x00dev->cap_flags)) +rt2x00rfkill_unregister (rt2x00dev); + +/* * Disable radio. */ rt2x00lib_disable_radio (rt2x00dev);
drivers/net/wireless/rt2x00/rt2x00mac.c +2 -0
@@ -489,6 +489,8 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, crypto.cipher =rt2x00crypto_key_to_cipher (key);if (crypto.cipher ==CIPHER_NONE )return -EOPNOTSUPP ; +if (crypto.cipher ==CIPHER_TKIP &&rt2x00_is_usb (rt2x00dev)) +return -EOPNOTSUPP ; crypto.cmd = cmd;
drivers/scsi/ibmvscsi/ibmvscsi.c +12 -1
@@ -185,6 +185,11 @@ static struct viosrp_crq *crq_queue_next_crq(struct crq_queue *queue)if (crq->valid &0x80 ) {if (++queue->cur == queue->size) queue->cur =0 ; + +/* Ensure the read of the valid bit occurs before reading any +* other bits of the CRQ entry +*/ +rmb (); }else crq =NULL ;spin_unlock_irqrestore (&queue->lock, flags);
@@ -203,6 +208,11 @@ static int ibmvscsi_send_crq(struct ibmvscsi_host_data *hostdata, {struct vio_dev *vdev =to_vio_dev (hostdata->dev); +/* +* Ensure the command buffer is flushed to memory before handing it +* over to the VIOS to prevent it from fetching any stale data. +*/ +mb ();return plpar_hcall_norets (H_SEND_CRQ , vdev->unit_address, word1, word2); }
@@ -794,7 +804,8 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata, int error_code) evt->hostdata->dev);if (evt->cmnd_done) evt->cmnd_done (evt->cmnd); - }else if (evt->done) + }else if (evt->done && evt->crq.format !=VIOSRP_MAD_FORMAT && + evt->iu.srp.login_req.opcode !=SRP_LOGIN_REQ ) evt->done (evt);free_event_struct (&evt->hostdata->pool, evt);spin_lock_irqsave (hostdata->host->host_lock, flags);
drivers/scsi/sym53c8xx_2/sym_hipd.c +4 -0
@@ -3000,7 +3000,11 @@ sym_dequeue_from_squeue(struct sym_hcb *np, int i, int target, int lun, int taskif ((target ==-1 || cp->target == target) && (lun ==-1 || cp->lun == lun) && (task ==-1 || cp->tag == task)) { +#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING sym_set_cam_status (cp->cmd,DID_SOFT_ERROR ); +#else +sym_set_cam_status (cp->cmd,DID_REQUEUE ); +#endif sym_remque (&cp->link_ccbq);sym_insque_tail (&cp->link_ccbq, &np->comp_ccbq); }
drivers/scsi/virtio_scsi.c +25 -1
@@ -270,6 +270,16 @@ static void virtscsi_req_done(struct virtqueue *vq)virtscsi_vq_done (vscsi, req_vq, virtscsi_complete_cmd); }; +static void virtscsi_poll_requests (struct virtio_scsi *vscsi) +{ +int i, num_vqs; + + num_vqs = vscsi->num_queues; +for (i =0 ; i < num_vqs; i++) +virtscsi_vq_done (vscsi, &vscsi->req_vqs[i], + virtscsi_complete_cmd); +} +static void virtscsi_complete_free (struct virtio_scsi *vscsi,void *buf) {struct virtio_scsi_cmd *cmd = buf;
@@ -288,6 +298,8 @@ static void virtscsi_ctrl_done(struct virtqueue *vq)virtscsi_vq_done (vscsi, &vscsi->ctrl_vq, virtscsi_complete_free); }; +static void virtscsi_handle_event (struct work_struct *work); +static int virtscsi_kick_event (struct virtio_scsi *vscsi,struct virtio_scsi_event_node *event_node) {
@@ -295,6 +307,7 @@ static int virtscsi_kick_event(struct virtio_scsi *vscsi,struct scatterlist sg;unsigned long flags; +INIT_WORK (&event_node->work, virtscsi_handle_event);sg_init_one (&sg, &event_node->event,sizeof (struct virtio_scsi_event ));spin_lock_irqsave (&vscsi->event_vq.vq_lock, flags);
@@ -412,7 +425,6 @@ static void virtscsi_complete_event(struct virtio_scsi *vscsi, void *buf) {struct virtio_scsi_event_node *event_node = buf; -INIT_WORK (&event_node->work, virtscsi_handle_event);schedule_work (&event_node->work); }
@@ -602,6 +614,18 @@ static int virtscsi_tmf(struct virtio_scsi *vscsi, struct virtio_scsi_cmd *cmd) cmd->resp.tmf.response == VIRTIO_SCSI_S_FUNCTION_SUCCEEDED) ret =SUCCESS ; +/* +* The spec guarantees that all requests related to the TMF have +* been completed, but the callback might not have run yet if +* we're using independent interrupts (e.g. MSI). Poll the +* virtqueues once. +* +* In the abort case, sc->scsi_done will do nothing, because +* the block layer must have detected a timeout and as a result +* REQ_ATOM_COMPLETE has been set. +*/ +virtscsi_poll_requests (vscsi); + out:mempool_free (cmd, virtscsi_cmd_pool);return ret;
drivers/tty/serial/8250/8250_dw.c +58 -16
116 lines not on this page · raw message
drivers/usb/gadget/f_fs.c +7 -5
@@ -1389,11 +1389,13 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev) ffs->ep0req->context = ffs; lang = ffs->stringtabs; -for (lang = ffs->stringtabs; *lang; ++lang) { -struct usb_string *str = (*lang)->strings; -int id = first_id; -for (; str->s; ++id, ++str) - str->id = id; +if (lang) { +for (; *lang; ++lang) { +struct usb_string *str = (*lang)->strings; +int id = first_id; +for (; str->s; ++id, ++str) + str->id = id; + } } ffs->gadget = cdev->gadget;
drivers/usb/host/xhci-ring.c +1 -1
@@ -3590,7 +3590,7 @@ static unsigned int xhci_get_burst_count(struct xhci_hcd *xhci,return 0 ; max_burst = urb->ep->ss_ep_comp.bMaxBurst; -return roundup (total_packet_count, max_burst +1 ) -1 ; +return DIV_ROUND_UP (total_packet_count, max_burst +1 ) -1 ; }/*
drivers/usb/host/xhci.c +7 -3
@@ -960,7 +960,7 @@ int xhci_suspend(struct xhci_hcd *xhci)*/ int xhci_resume (struct xhci_hcd *xhci,bool hibernated) { -u32 command, temp =0 ; +u32 command, temp =0 , status;struct usb_hcd *hcd =xhci_to_hcd (xhci);struct usb_hcd *secondary_hcd;int retval =0 ;
@@ -1084,8 +1084,12 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) done:if (retval ==0 ) { -usb_hcd_resume_root_hub (hcd); -usb_hcd_resume_root_hub (xhci->shared_hcd); +/* Resume root hubs only when have pending events. */ + status =readl (&xhci->op_regs->status); +if (status &STS_EINT ) { +usb_hcd_resume_root_hub (hcd); +usb_hcd_resume_root_hub (xhci->shared_hcd); + } }/*
drivers/usb/serial/ftdi_sio.c +5 -2
@@ -1577,14 +1577,17 @@ static void ftdi_set_max_packet_size(struct usb_serial_port *port)struct usb_device *udev = serial->dev;struct usb_interface *interface = serial->interface; -struct usb_endpoint_descriptor *ep_desc = &interface->cur_altsetting->endpoint[1 ].desc; +struct usb_endpoint_descriptor *ep_desc;unsigned num_endpoints; -int i; +unsigned i; num_endpoints = interface->cur_altsetting->desc.bNumEndpoints;dev_info (&udev->dev,"Number of endpoints %d\n" , num_endpoints); +if (!num_endpoints) +return ; +/* NOTE: some customers have programmed FT232R/FT245R devices * with an endpoint size of 0 - not good. In this case, we * want to override the endpoint descriptor setting and use a
drivers/usb/serial/option.c +20 -6
@@ -352,6 +352,9 @@ static void option_instat_callback(struct urb *urb);/* Zoom */ #define ZOOM_PRODUCT_4597 0x9607 +/* SpeedUp SU9800 usb 3g modem */ +#define SPEEDUP_PRODUCT_SU9800 0x9800 +/* Haier products */ #define HAIER_VENDOR_ID 0x201e#define HAIER_PRODUCT_CE100 0x2009
@@ -372,8 +375,12 @@ static void option_instat_callback(struct urb *urb);/* Olivetti products */ #define OLIVETTI_VENDOR_ID 0x0b3c#define OLIVETTI_PRODUCT_OLICARD100 0xc000 +#define OLIVETTI_PRODUCT_OLICARD120 0xc001 +#define OLIVETTI_PRODUCT_OLICARD140 0xc002#define OLIVETTI_PRODUCT_OLICARD145 0xc003 +#define OLIVETTI_PRODUCT_OLICARD155 0xc004#define OLIVETTI_PRODUCT_OLICARD200 0xc005 +#define OLIVETTI_PRODUCT_OLICARD160 0xc00a#define OLIVETTI_PRODUCT_OLICARD500 0xc00b/* Celot products */
@@ -1577,6 +1584,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), .driver_info = (kernel_ulong_t)&four_g_w14_blacklist }, + { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) }, { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) }, { USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) }, { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
@@ -1611,15 +1619,21 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) }, { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */ { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) }, - - { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD140), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) }, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD155), + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200), - .driver_info = (kernel_ulong_t)&net_intf6_blacklist - }, + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD160), + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD500), - .driver_info = (kernel_ulong_t)&net_intf4_blacklist - }, + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/ { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },
drivers/video/fb-puv3.c +2 -0
@@ -18,8 +18,10 @@#include <linux/fb.h> #include <linux/init.h> #include <linux/console.h> +#include <linux/mm.h> #include <asm/sizes.h> +#include <asm/pgtable.h> #include <mach/hardware.h> /* Platform_data reserved for unifb registers. */
fs/cifs/cifs_unicode.c +4 -3
@@ -290,7 +290,8 @@ int cifsConvertToUTF16(__le16 *target, const char *source, int srclen, const struct nls_table *cp, int mapChars) { -int i, j, charlen; +int i, charlen; +int j =0 ;char src_char;__le16 dst_char;wchar_t tmp;
@@ -298,12 +299,11 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen,if (!mapChars)return cifs_strtoUTF16 (target, source,PATH_MAX , cp); -for (i =0 , j =0 ; i < srclen; j++) { +for (i =0 ; i < srclen; j++) { src_char = source[i]; charlen =1 ;switch (src_char) {case 0 : -put_unaligned (0 , &target[j]); goto ctoUTF16_out;case ':' : dst_char =cpu_to_le16 (UNI_COLON );
@@ -350,6 +350,7 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen, } ctoUTF16_out: +put_unaligned (0 , &target[j]);/* Null terminate target unicode string */ return j; }
fs/ext4/indirect.c +17 -3
@@ -390,7 +390,13 @@ static int ext4_alloc_branch(handle_t *handle, struct inode *inode,return 0 ; failed:for (; i >=0 ; i--) { -if (i != indirect_blks && branch[i].bh) +/* +* We want to ext4_forget() only freshly allocated indirect +* blocks. Buffer for new_blocks[i-1] is at branch[i].bh and +* buffer at branch[0].bh is indirect block / inode already +* existing before ext4_alloc_branch() was called. +*/ +if (i >0 && i != indirect_blks && branch[i].bh)ext4_forget (handle,1 , inode, branch[i].bh, branch[i].bh->b_blocknr); ext4_free_blocks(handle, inode, NULL, new_blocks[i],
@@ -1325,16 +1331,24 @@ static int free_hole_blocks(handle_t *handle, struct inode *inode, blk = *i_data;if (level >0 ) {ext4_lblk_t first2; +ext4_lblk_t count2; + bh =sb_bread (inode->i_sb,le32_to_cpu (blk));if (!bh) {EXT4_ERROR_INODE_BLOCK (inode,le32_to_cpu (blk),"Read failure" );return -EIO ; } - first2 = (first > offset) ? first - offset :0 ; +if (first > offset) { + first2 = first - offset; + count2 = count; + }else { + first2 =0 ; + count2 = count - (offset - first); + } ret =free_hole_blocks (handle, inode, bh, (__le32 *)bh->b_data, level -1 , - first2, count - offset, + first2, count2, inode->i_sb->s_blocksize >>2 );if (ret) {brelse (bh);
fs/nfsd/nfs4proc.c +0 -9
@@ -576,15 +576,6 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,switch (create->cr_type) {case NF4LNK : -/* ugh! we have to null-terminate the linktext, or -* vfs_symlink() will choke. it is always safe to -* null-terminate by brute force, since at worst we -* will overwrite the first byte of the create namelen -* in the XDR buffer, which has already been extracted -* during XDR decode. -*/ - create->cr_linkname[create->cr_linklen] =0 ; - status = nfsd_symlink(rqstp, &cstate->current_fh, create->cr_name, create->cr_namelen, create->cr_linkname, create->cr_linklen,
fs/nfsd/nfs4xdr.c +12 -1
@@ -553,7 +553,18 @@ nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *createREAD_BUF (4 );READ32 (create->cr_linklen);READ_BUF (create->cr_linklen); -SAVEMEM (create->cr_linkname, create->cr_linklen); +/* +* The VFS will want a null-terminated string, and +* null-terminating in place isn't safe since this might +* end on a page boundary: +*/ + create->cr_linkname = +kmalloc (create->cr_linklen +1 ,GFP_KERNEL ); +if (!create->cr_linkname) +return nfserr_jukebox; +memcpy (create->cr_linkname, p, create->cr_linklen); + create->cr_linkname[create->cr_linklen] ='\0' ; +defer_free (argp, kfree, create->cr_linkname);break ;case NF4BLK :case NF4CHR :
kernel/trace/trace.c +0 -2
@@ -1306,7 +1306,6 @@ void tracing_start(void)arch_spin_unlock (&ftrace_max_lock); -ftrace_start (); out:raw_spin_unlock_irqrestore (&global_trace.start_lock, flags); }
@@ -1353,7 +1352,6 @@ void tracing_stop(void)struct ring_buffer *buffer;unsigned long flags; -ftrace_stop ();raw_spin_lock_irqsave (&global_trace.start_lock, flags);if (global_trace.stop_count++) goto out;
mm/hugetlb.c +43 -28
91 lines not on this page · raw message
mm/mempolicy.c +20 -26
113 lines not on this page · raw message
net/bluetooth/hci_conn.c +1 -1
@@ -659,7 +659,7 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)/* If we're already encrypted set the REAUTH_PEND flag, * otherwise set the ENCRYPT_PEND. */ -if (conn->key_type !=0xff ) +if (conn->link_mode &HCI_LM_ENCRYPT )set_bit (HCI_CONN_REAUTH_PEND , &conn->flags);else set_bit (HCI_CONN_ENCRYPT_PEND , &conn->flags);
net/bluetooth/hci_event.c +5 -2
@@ -3218,8 +3218,11 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev,/* If we're not the initiators request authorization to * proceed from user space (mgmt_user_confirm with -* confirm_hint set to 1). */ -if (!test_bit (HCI_CONN_AUTH_PEND , &conn->flags)) { +* confirm_hint set to 1). The exception is if neither +* side had MITM in which case we do auto-accept. +*/ +if (!test_bit (HCI_CONN_AUTH_PEND , &conn->flags) && + (loc_mitm || rem_mitm)) {BT_DBG ("Confirming auto-accept as acceptor" ); confirm_hint =1 ; goto confirm;
net/bluetooth/mgmt.c +6 -1
@@ -2333,8 +2333,13 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, }if (addr->type ==BDADDR_LE_PUBLIC || addr->type ==BDADDR_LE_RANDOM ) { -/* Continue with pairing via SMP */ +/* Continue with pairing via SMP. The hdev lock must be +* released as SMP may try to recquire it for crypto +* purposes. +*/ +hci_dev_unlock (hdev); err =smp_user_confirm_reply (conn, mgmt_op, passkey); +hci_dev_lock (hdev);if (!err) err = cmd_complete(sk, hdev->id, mgmt_op,
net/mac80211/debugfs_netdev.c +2 -4
@@ -34,8 +34,7 @@ static ssize_t ieee80211_if_read(ssize_t ret = -EINVAL ;read_lock (&dev_base_lock); -if (sdata->dev->reg_state ==NETREG_REGISTERED ) - ret = (*format)(sdata, buf,sizeof (buf)); + ret = (*format)(sdata, buf,sizeof (buf));read_unlock (&dev_base_lock);if (ret >=0 )
@@ -62,8 +61,7 @@ static ssize_t ieee80211_if_write( ret = -ENODEV ;rtnl_lock (); -if (sdata->dev->reg_state ==NETREG_REGISTERED ) - ret = (*write)(sdata, buf, count); + ret = (*write)(sdata, buf, count);rtnl_unlock ();return ret;
net/mac80211/sta_info.c +1 -0
@@ -270,6 +270,7 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)sta_dbg (sta->sdata,"Destroyed STA %pM\n" , sta->sta.addr); +kfree (rcu_dereference_raw (sta->sta.rates));kfree (sta); }
sound/usb/pcm.c +2 -1
@@ -1420,7 +1420,8 @@ static void retire_playback_urb(struct snd_usb_substream *subs,* on two reads of a counter updated every ms. */ if (abs (est_delay - subs->last_delay) *1000 > runtime->rate *2 ) -snd_printk (KERN_DEBUG "delay: estimated %d, actual %d\n" , +dev_dbg_ratelimited (&subs->dev->dev, +"delay: estimated %d, actual %d\n" , est_delay, subs->last_delay);if (!subs->running) {
tools/usb/ffs-test.c +2 -2
@@ -116,8 +116,8 @@ static const struct { .header = { .magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC), .length = cpu_to_le32(sizeof descriptors), - .fs_count = 3, - .hs_count = 3, + .fs_count = cpu_to_le32(3), + .hs_count = cpu_to_le32(3), }, .fs_descs = { .intf = {