Changeset 32049


Ignore:
Timestamp:
May 14, 2017, 6:47:22 PM (9 days ago)
Author:
brainslayer
Message:

update kernel

Location:
src/linux/universal
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-4.4/Makefile

    r32025 r32049  
    22PATCHLEVEL = 4
    33SUBLEVEL = 68
    4 EXTRAVERSION = -rc1
     4EXTRAVERSION =
    55NAME = Blurry Fish Butt
    66
  • src/linux/universal/linux-4.4/drivers/scsi/device_handler/scsi_dh_emc.c

    r32025 r32049  
    457457                                struct clariion_dh_data *csdev)
    458458{
    459         int err = SCSI_DH_OK;
     459        int err;
    460460        char *sp_model;
    461461
  • src/linux/universal/linux-4.4/drivers/usb/serial/sierra.c

    r32025 r32049  
    138138}
    139139
    140 static u8 sierra_interface_num(struct usb_serial *serial)
    141 {
    142         return serial->interface->cur_altsetting->desc.bInterfaceNumber;
     140static int sierra_calc_interface(struct usb_serial *serial)
     141{
     142        int interface;
     143        struct usb_interface *p_interface;
     144        struct usb_host_interface *p_host_interface;
     145
     146        /* Get the interface structure pointer from the serial struct */
     147        p_interface = serial->interface;
     148
     149        /* Get a pointer to the host interface structure */
     150        p_host_interface = p_interface->cur_altsetting;
     151
     152        /* read the interface descriptor for this active altsetting
     153         * to find out the interface number we are on
     154        */
     155        interface = p_host_interface->desc.bInterfaceNumber;
     156
     157        return interface;
    143158}
    144159
     
    151166
    152167        udev = serial->dev;
    153         ifnum = sierra_interface_num(serial);
     168        ifnum = sierra_calc_interface(serial);
    154169
    155170        /*
     
    163178                usb_set_interface(udev, ifnum, 1);
    164179        }
     180
     181        /* ifnum could have changed - by calling usb_set_interface */
     182        ifnum = sierra_calc_interface(serial);
    165183
    166184        if (is_blacklisted(ifnum,
     
    325343        /* If composite device then properly report interface */
    326344        if (serial->num_ports == 1) {
    327                 interface = sierra_interface_num(serial);
     345                interface = sierra_calc_interface(serial);
    328346                /* Control message is sent only to interfaces with
    329347                 * interrupt_in endpoints
     
    899917        if (serial->num_ports == 1) {
    900918                /* Get interface number for composite device */
    901                 ifnum = sierra_interface_num(serial);
     919                ifnum = sierra_calc_interface(serial);
    902920                himemoryp = &typeB_interface_list;
    903921        } else {
  • src/linux/universal/linux-4.9/Makefile

    r32025 r32049  
    22PATCHLEVEL = 9
    33SUBLEVEL = 28
    4 EXTRAVERSION = -rc1
     4EXTRAVERSION =
    55NAME = Roaring Lionus
    66
  • src/linux/universal/linux-4.9/drivers/scsi/device_handler/scsi_dh_emc.c

    r32025 r32049  
    462462                                struct clariion_dh_data *csdev)
    463463{
    464         int err = SCSI_DH_OK;
     464        int err;
    465465        char *sp_model;
    466466
  • src/linux/universal/linux-4.9/drivers/usb/serial/sierra.c

    r32025 r32049  
    138138}
    139139
    140 static u8 sierra_interface_num(struct usb_serial *serial)
    141 {
    142         return serial->interface->cur_altsetting->desc.bInterfaceNumber;
     140static int sierra_calc_interface(struct usb_serial *serial)
     141{
     142        int interface;
     143        struct usb_interface *p_interface;
     144        struct usb_host_interface *p_host_interface;
     145
     146        /* Get the interface structure pointer from the serial struct */
     147        p_interface = serial->interface;
     148
     149        /* Get a pointer to the host interface structure */
     150        p_host_interface = p_interface->cur_altsetting;
     151
     152        /* read the interface descriptor for this active altsetting
     153         * to find out the interface number we are on
     154        */
     155        interface = p_host_interface->desc.bInterfaceNumber;
     156
     157        return interface;
    143158}
    144159
     
    151166
    152167        udev = serial->dev;
    153         ifnum = sierra_interface_num(serial);
     168        ifnum = sierra_calc_interface(serial);
    154169
    155170        /*
     
    163178                usb_set_interface(udev, ifnum, 1);
    164179        }
     180
     181        /* ifnum could have changed - by calling usb_set_interface */
     182        ifnum = sierra_calc_interface(serial);
    165183
    166184        if (is_blacklisted(ifnum,
     
    325343        /* If composite device then properly report interface */
    326344        if (serial->num_ports == 1) {
    327                 interface = sierra_interface_num(serial);
     345                interface = sierra_calc_interface(serial);
    328346                /* Control message is sent only to interfaces with
    329347                 * interrupt_in endpoints
     
    899917        if (serial->num_ports == 1) {
    900918                /* Get interface number for composite device */
    901                 ifnum = sierra_interface_num(serial);
     919                ifnum = sierra_calc_interface(serial);
    902920                himemoryp = &typeB_interface_list;
    903921        } else {
Note: See TracChangeset for help on using the changeset viewer.