+++ /dev/null
-From 4d7d39a18b8b81511f0b893b7d2203790bf8a58b Mon Sep 17 00:00:00 2001
-From: Dan Carpenter <dan.carpenter@oracle.com>
-Date: Tue, 21 Feb 2017 21:46:37 +0300
-Subject: scsi: scsi_dh_emc: return success in clariion_std_inquiry()
-
-From: Dan Carpenter <dan.carpenter@oracle.com>
-
-commit 4d7d39a18b8b81511f0b893b7d2203790bf8a58b upstream.
-
-We accidentally return an uninitialized variable on success.
-
-Fixes: b6ff1b14cdf4 ("[SCSI] scsi_dh: Update EMC handler")
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/device_handler/scsi_dh_emc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/scsi/device_handler/scsi_dh_emc.c
-+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
-@@ -464,7 +464,7 @@ static int clariion_prep_fn(struct scsi_
- static int clariion_std_inquiry(struct scsi_device *sdev,
- struct clariion_dh_data *csdev)
- {
-- int err;
-+ int err = SCSI_DH_OK;
- char *sp_model;
-
- err = send_inquiry_cmd(sdev, 0, csdev);
usb-serial-quatech2-fix-control-message-error-handling.patch
usb-serial-mct_u232-fix-modem-status-error-handling.patch
usb-serial-io_edgeport-fix-descriptor-error-handling.patch
-usb-serial-sierra-fix-bogus-alternate-setting-assumption.patch
-scsi-scsi_dh_emc-return-success-in-clariion_std_inquiry.patch
brcmfmac-ensure-pointer-correctly-set-if-skb-data-location-changes.patch
brcmfmac-make-skb-header-writable-before-use.patch
staging-emxx_udc-remove-incorrect-__init-annotations.patch
+++ /dev/null
-From 16620b483eaf7750413bae472f4363b6b959fcaa Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Mon, 6 Feb 2017 16:28:14 +0100
-Subject: USB: serial: sierra: fix bogus alternate-setting assumption
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 16620b483eaf7750413bae472f4363b6b959fcaa upstream.
-
-Interface numbers do not change when enabling alternate settings as
-comment and code in this driver suggested.
-
-Remove the confusing comment and redundant retrieval of the interface
-number in probe, while simplifying and renaming the interface-number
-helper.
-
-Fixes: 4db2299da213 ("sierra: driver interface blacklisting")
-Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/sierra.c | 28 +++++-----------------------
- 1 file changed, 5 insertions(+), 23 deletions(-)
-
---- a/drivers/usb/serial/sierra.c
-+++ b/drivers/usb/serial/sierra.c
-@@ -137,24 +137,9 @@ static int is_himemory(const u8 ifnum,
- return 0;
- }
-
--static int sierra_calc_interface(struct usb_serial *serial)
-+static u8 sierra_interface_num(struct usb_serial *serial)
- {
-- int interface;
-- struct usb_interface *p_interface;
-- struct usb_host_interface *p_host_interface;
--
-- /* Get the interface structure pointer from the serial struct */
-- p_interface = serial->interface;
--
-- /* Get a pointer to the host interface structure */
-- p_host_interface = p_interface->cur_altsetting;
--
-- /* read the interface descriptor for this active altsetting
-- * to find out the interface number we are on
-- */
-- interface = p_host_interface->desc.bInterfaceNumber;
--
-- return interface;
-+ return serial->interface->cur_altsetting->desc.bInterfaceNumber;
- }
-
- static int sierra_probe(struct usb_serial *serial,
-@@ -165,7 +150,7 @@ static int sierra_probe(struct usb_seria
- u8 ifnum;
-
- udev = serial->dev;
-- ifnum = sierra_calc_interface(serial);
-+ ifnum = sierra_interface_num(serial);
-
- /*
- * If this interface supports more than 1 alternate
-@@ -178,9 +163,6 @@ static int sierra_probe(struct usb_seria
- usb_set_interface(udev, ifnum, 1);
- }
-
-- /* ifnum could have changed - by calling usb_set_interface */
-- ifnum = sierra_calc_interface(serial);
--
- if (is_blacklisted(ifnum,
- (struct sierra_iface_info *)id->driver_info)) {
- dev_dbg(&serial->dev->dev,
-@@ -342,7 +324,7 @@ static int sierra_send_setup(struct usb_
-
- /* If composite device then properly report interface */
- if (serial->num_ports == 1) {
-- interface = sierra_calc_interface(serial);
-+ interface = sierra_interface_num(serial);
- /* Control message is sent only to interfaces with
- * interrupt_in endpoints
- */
-@@ -916,7 +898,7 @@ static int sierra_port_probe(struct usb_
- /* Determine actual memory requirements */
- if (serial->num_ports == 1) {
- /* Get interface number for composite device */
-- ifnum = sierra_calc_interface(serial);
-+ ifnum = sierra_interface_num(serial);
- himemoryp = &typeB_interface_list;
- } else {
- /* This is really the usb-serial port number of the interface
+++ /dev/null
-From 4d7d39a18b8b81511f0b893b7d2203790bf8a58b Mon Sep 17 00:00:00 2001
-From: Dan Carpenter <dan.carpenter@oracle.com>
-Date: Tue, 21 Feb 2017 21:46:37 +0300
-Subject: scsi: scsi_dh_emc: return success in clariion_std_inquiry()
-
-From: Dan Carpenter <dan.carpenter@oracle.com>
-
-commit 4d7d39a18b8b81511f0b893b7d2203790bf8a58b upstream.
-
-We accidentally return an uninitialized variable on success.
-
-Fixes: b6ff1b14cdf4 ("[SCSI] scsi_dh: Update EMC handler")
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/device_handler/scsi_dh_emc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/scsi/device_handler/scsi_dh_emc.c
-+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
-@@ -461,7 +461,7 @@ static int clariion_prep_fn(struct scsi_
- static int clariion_std_inquiry(struct scsi_device *sdev,
- struct clariion_dh_data *csdev)
- {
-- int err;
-+ int err = SCSI_DH_OK;
- char *sp_model;
-
- err = send_inquiry_cmd(sdev, 0, csdev);
usb-serial-mct_u232-fix-modem-status-error-handling.patch
usb-serial-ch341-fix-modem-status-handling.patch
usb-serial-io_edgeport-fix-descriptor-error-handling.patch
-usb-serial-sierra-fix-bogus-alternate-setting-assumption.patch
clk-rockchip-add-to-mux_pll_src_apll_dpll_gpll_usb480m_p-on-rk3036.patch
phy-qcom-usb-hs-add-depends-on-extcon.patch
serial-8250_omap-fix-probe-and-remove-for-pm-runtime.patch
scsi-qedi-fix-build-error-without-debug_fs.patch
scsi-qla2xxx-fix-crash-in-qla2xxx_eh_abort-on-bad-ptr.patch
scsi-mac_scsi-fix-mac_scsi-m-option-when-scsi-m.patch
-scsi-scsi_dh_emc-return-success-in-clariion_std_inquiry.patch
scsi-smartpqi-fix-time-handling.patch
mips-r2-on-r6-multu-maddu-msubu-emulation-bugfix.patch
brcmfmac-ensure-pointer-correctly-set-if-skb-data-location-changes.patch
+++ /dev/null
-From 16620b483eaf7750413bae472f4363b6b959fcaa Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Mon, 6 Feb 2017 16:28:14 +0100
-Subject: USB: serial: sierra: fix bogus alternate-setting assumption
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 16620b483eaf7750413bae472f4363b6b959fcaa upstream.
-
-Interface numbers do not change when enabling alternate settings as
-comment and code in this driver suggested.
-
-Remove the confusing comment and redundant retrieval of the interface
-number in probe, while simplifying and renaming the interface-number
-helper.
-
-Fixes: 4db2299da213 ("sierra: driver interface blacklisting")
-Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/sierra.c | 28 +++++-----------------------
- 1 file changed, 5 insertions(+), 23 deletions(-)
-
---- a/drivers/usb/serial/sierra.c
-+++ b/drivers/usb/serial/sierra.c
-@@ -137,24 +137,9 @@ static int is_himemory(const u8 ifnum,
- return 0;
- }
-
--static int sierra_calc_interface(struct usb_serial *serial)
-+static u8 sierra_interface_num(struct usb_serial *serial)
- {
-- int interface;
-- struct usb_interface *p_interface;
-- struct usb_host_interface *p_host_interface;
--
-- /* Get the interface structure pointer from the serial struct */
-- p_interface = serial->interface;
--
-- /* Get a pointer to the host interface structure */
-- p_host_interface = p_interface->cur_altsetting;
--
-- /* read the interface descriptor for this active altsetting
-- * to find out the interface number we are on
-- */
-- interface = p_host_interface->desc.bInterfaceNumber;
--
-- return interface;
-+ return serial->interface->cur_altsetting->desc.bInterfaceNumber;
- }
-
- static int sierra_probe(struct usb_serial *serial,
-@@ -165,7 +150,7 @@ static int sierra_probe(struct usb_seria
- u8 ifnum;
-
- udev = serial->dev;
-- ifnum = sierra_calc_interface(serial);
-+ ifnum = sierra_interface_num(serial);
-
- /*
- * If this interface supports more than 1 alternate
-@@ -178,9 +163,6 @@ static int sierra_probe(struct usb_seria
- usb_set_interface(udev, ifnum, 1);
- }
-
-- /* ifnum could have changed - by calling usb_set_interface */
-- ifnum = sierra_calc_interface(serial);
--
- if (is_blacklisted(ifnum,
- (struct sierra_iface_info *)id->driver_info)) {
- dev_dbg(&serial->dev->dev,
-@@ -342,7 +324,7 @@ static int sierra_send_setup(struct usb_
-
- /* If composite device then properly report interface */
- if (serial->num_ports == 1) {
-- interface = sierra_calc_interface(serial);
-+ interface = sierra_interface_num(serial);
- /* Control message is sent only to interfaces with
- * interrupt_in endpoints
- */
-@@ -916,7 +898,7 @@ static int sierra_port_probe(struct usb_
- /* Determine actual memory requirements */
- if (serial->num_ports == 1) {
- /* Get interface number for composite device */
-- ifnum = sierra_calc_interface(serial);
-+ ifnum = sierra_interface_num(serial);
- himemoryp = &typeB_interface_list;
- } else {
- /* This is really the usb-serial port number of the interface
+++ /dev/null
-From 4d7d39a18b8b81511f0b893b7d2203790bf8a58b Mon Sep 17 00:00:00 2001
-From: Dan Carpenter <dan.carpenter@oracle.com>
-Date: Tue, 21 Feb 2017 21:46:37 +0300
-Subject: scsi: scsi_dh_emc: return success in clariion_std_inquiry()
-
-From: Dan Carpenter <dan.carpenter@oracle.com>
-
-commit 4d7d39a18b8b81511f0b893b7d2203790bf8a58b upstream.
-
-We accidentally return an uninitialized variable on success.
-
-Fixes: b6ff1b14cdf4 ("[SCSI] scsi_dh: Update EMC handler")
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/device_handler/scsi_dh_emc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/scsi/device_handler/scsi_dh_emc.c
-+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
-@@ -456,7 +456,7 @@ static int clariion_prep_fn(struct scsi_
- static int clariion_std_inquiry(struct scsi_device *sdev,
- struct clariion_dh_data *csdev)
- {
-- int err;
-+ int err = SCSI_DH_OK;
- char *sp_model;
-
- err = send_inquiry_cmd(sdev, 0, csdev);
usb-serial-quatech2-fix-control-message-error-handling.patch
usb-serial-mct_u232-fix-modem-status-error-handling.patch
usb-serial-io_edgeport-fix-descriptor-error-handling.patch
-usb-serial-sierra-fix-bogus-alternate-setting-assumption.patch
phy-qcom-usb-hs-add-depends-on-extcon.patch
serial-8250_omap-fix-probe-and-remove-for-pm-runtime.patch
scsi-mac_scsi-fix-mac_scsi-m-option-when-scsi-m.patch
-scsi-scsi_dh_emc-return-success-in-clariion_std_inquiry.patch
mips-r2-on-r6-multu-maddu-msubu-emulation-bugfix.patch
brcmfmac-ensure-pointer-correctly-set-if-skb-data-location-changes.patch
brcmfmac-make-skb-header-writable-before-use.patch
+++ /dev/null
-From 16620b483eaf7750413bae472f4363b6b959fcaa Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Mon, 6 Feb 2017 16:28:14 +0100
-Subject: USB: serial: sierra: fix bogus alternate-setting assumption
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 16620b483eaf7750413bae472f4363b6b959fcaa upstream.
-
-Interface numbers do not change when enabling alternate settings as
-comment and code in this driver suggested.
-
-Remove the confusing comment and redundant retrieval of the interface
-number in probe, while simplifying and renaming the interface-number
-helper.
-
-Fixes: 4db2299da213 ("sierra: driver interface blacklisting")
-Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/sierra.c | 28 +++++-----------------------
- 1 file changed, 5 insertions(+), 23 deletions(-)
-
---- a/drivers/usb/serial/sierra.c
-+++ b/drivers/usb/serial/sierra.c
-@@ -137,24 +137,9 @@ static int is_himemory(const u8 ifnum,
- return 0;
- }
-
--static int sierra_calc_interface(struct usb_serial *serial)
-+static u8 sierra_interface_num(struct usb_serial *serial)
- {
-- int interface;
-- struct usb_interface *p_interface;
-- struct usb_host_interface *p_host_interface;
--
-- /* Get the interface structure pointer from the serial struct */
-- p_interface = serial->interface;
--
-- /* Get a pointer to the host interface structure */
-- p_host_interface = p_interface->cur_altsetting;
--
-- /* read the interface descriptor for this active altsetting
-- * to find out the interface number we are on
-- */
-- interface = p_host_interface->desc.bInterfaceNumber;
--
-- return interface;
-+ return serial->interface->cur_altsetting->desc.bInterfaceNumber;
- }
-
- static int sierra_probe(struct usb_serial *serial,
-@@ -165,7 +150,7 @@ static int sierra_probe(struct usb_seria
- u8 ifnum;
-
- udev = serial->dev;
-- ifnum = sierra_calc_interface(serial);
-+ ifnum = sierra_interface_num(serial);
-
- /*
- * If this interface supports more than 1 alternate
-@@ -178,9 +163,6 @@ static int sierra_probe(struct usb_seria
- usb_set_interface(udev, ifnum, 1);
- }
-
-- /* ifnum could have changed - by calling usb_set_interface */
-- ifnum = sierra_calc_interface(serial);
--
- if (is_blacklisted(ifnum,
- (struct sierra_iface_info *)id->driver_info)) {
- dev_dbg(&serial->dev->dev,
-@@ -342,7 +324,7 @@ static int sierra_send_setup(struct usb_
-
- /* If composite device then properly report interface */
- if (serial->num_ports == 1) {
-- interface = sierra_calc_interface(serial);
-+ interface = sierra_interface_num(serial);
- /* Control message is sent only to interfaces with
- * interrupt_in endpoints
- */
-@@ -916,7 +898,7 @@ static int sierra_port_probe(struct usb_
- /* Determine actual memory requirements */
- if (serial->num_ports == 1) {
- /* Get interface number for composite device */
-- ifnum = sierra_calc_interface(serial);
-+ ifnum = sierra_interface_num(serial);
- himemoryp = &typeB_interface_list;
- } else {
- /* This is really the usb-serial port number of the interface
+++ /dev/null
-From 4d7d39a18b8b81511f0b893b7d2203790bf8a58b Mon Sep 17 00:00:00 2001
-From: Dan Carpenter <dan.carpenter@oracle.com>
-Date: Tue, 21 Feb 2017 21:46:37 +0300
-Subject: scsi: scsi_dh_emc: return success in clariion_std_inquiry()
-
-From: Dan Carpenter <dan.carpenter@oracle.com>
-
-commit 4d7d39a18b8b81511f0b893b7d2203790bf8a58b upstream.
-
-We accidentally return an uninitialized variable on success.
-
-Fixes: b6ff1b14cdf4 ("[SCSI] scsi_dh: Update EMC handler")
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/device_handler/scsi_dh_emc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/scsi/device_handler/scsi_dh_emc.c
-+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
-@@ -461,7 +461,7 @@ static int clariion_prep_fn(struct scsi_
- static int clariion_std_inquiry(struct scsi_device *sdev,
- struct clariion_dh_data *csdev)
- {
-- int err;
-+ int err = SCSI_DH_OK;
- char *sp_model;
-
- err = send_inquiry_cmd(sdev, 0, csdev);
usb-serial-quatech2-fix-control-message-error-handling.patch
usb-serial-mct_u232-fix-modem-status-error-handling.patch
usb-serial-io_edgeport-fix-descriptor-error-handling.patch
-usb-serial-sierra-fix-bogus-alternate-setting-assumption.patch
clk-rockchip-add-to-mux_pll_src_apll_dpll_gpll_usb480m_p-on-rk3036.patch
phy-qcom-usb-hs-add-depends-on-extcon.patch
serial-8250_omap-fix-probe-and-remove-for-pm-runtime.patch
scsi-qla2xxx-fix-crash-in-qla2xxx_eh_abort-on-bad-ptr.patch
scsi-mac_scsi-fix-mac_scsi-m-option-when-scsi-m.patch
-scsi-scsi_dh_emc-return-success-in-clariion_std_inquiry.patch
scsi-smartpqi-fix-time-handling.patch
mips-r2-on-r6-multu-maddu-msubu-emulation-bugfix.patch
brcmfmac-ensure-pointer-correctly-set-if-skb-data-location-changes.patch
+++ /dev/null
-From 16620b483eaf7750413bae472f4363b6b959fcaa Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Mon, 6 Feb 2017 16:28:14 +0100
-Subject: USB: serial: sierra: fix bogus alternate-setting assumption
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 16620b483eaf7750413bae472f4363b6b959fcaa upstream.
-
-Interface numbers do not change when enabling alternate settings as
-comment and code in this driver suggested.
-
-Remove the confusing comment and redundant retrieval of the interface
-number in probe, while simplifying and renaming the interface-number
-helper.
-
-Fixes: 4db2299da213 ("sierra: driver interface blacklisting")
-Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/sierra.c | 28 +++++-----------------------
- 1 file changed, 5 insertions(+), 23 deletions(-)
-
---- a/drivers/usb/serial/sierra.c
-+++ b/drivers/usb/serial/sierra.c
-@@ -137,24 +137,9 @@ static int is_himemory(const u8 ifnum,
- return 0;
- }
-
--static int sierra_calc_interface(struct usb_serial *serial)
-+static u8 sierra_interface_num(struct usb_serial *serial)
- {
-- int interface;
-- struct usb_interface *p_interface;
-- struct usb_host_interface *p_host_interface;
--
-- /* Get the interface structure pointer from the serial struct */
-- p_interface = serial->interface;
--
-- /* Get a pointer to the host interface structure */
-- p_host_interface = p_interface->cur_altsetting;
--
-- /* read the interface descriptor for this active altsetting
-- * to find out the interface number we are on
-- */
-- interface = p_host_interface->desc.bInterfaceNumber;
--
-- return interface;
-+ return serial->interface->cur_altsetting->desc.bInterfaceNumber;
- }
-
- static int sierra_probe(struct usb_serial *serial,
-@@ -165,7 +150,7 @@ static int sierra_probe(struct usb_seria
- u8 ifnum;
-
- udev = serial->dev;
-- ifnum = sierra_calc_interface(serial);
-+ ifnum = sierra_interface_num(serial);
-
- /*
- * If this interface supports more than 1 alternate
-@@ -178,9 +163,6 @@ static int sierra_probe(struct usb_seria
- usb_set_interface(udev, ifnum, 1);
- }
-
-- /* ifnum could have changed - by calling usb_set_interface */
-- ifnum = sierra_calc_interface(serial);
--
- if (is_blacklisted(ifnum,
- (struct sierra_iface_info *)id->driver_info)) {
- dev_dbg(&serial->dev->dev,
-@@ -342,7 +324,7 @@ static int sierra_send_setup(struct usb_
-
- /* If composite device then properly report interface */
- if (serial->num_ports == 1) {
-- interface = sierra_calc_interface(serial);
-+ interface = sierra_interface_num(serial);
- /* Control message is sent only to interfaces with
- * interrupt_in endpoints
- */
-@@ -916,7 +898,7 @@ static int sierra_port_probe(struct usb_
- /* Determine actual memory requirements */
- if (serial->num_ports == 1) {
- /* Get interface number for composite device */
-- ifnum = sierra_calc_interface(serial);
-+ ifnum = sierra_interface_num(serial);
- himemoryp = &typeB_interface_list;
- } else {
- /* This is really the usb-serial port number of the interface
projects / thirdparty / kernel / stable-queue.git / commitdiff
