提交 28c3ae9a 编写于 作者: J Johan Hovold 提交者: Greg Kroah-Hartman

USB: mos7840: remove NULL-urb submission

The private int_urb is never allocated so the submission from the
control completion handler will always fail. Remove this odd piece of
broken code.
Signed-off-by: NJohan Hovold <jhovold@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 961be09e
...@@ -218,7 +218,6 @@ struct moschip_port { ...@@ -218,7 +218,6 @@ struct moschip_port {
int port_num; /*Actual port number in the device(1,2,etc) */ int port_num; /*Actual port number in the device(1,2,etc) */
struct urb *write_urb; /* write URB for this port */ struct urb *write_urb; /* write URB for this port */
struct urb *read_urb; /* read URB for this port */ struct urb *read_urb; /* read URB for this port */
struct urb *int_urb;
__u8 shadowLCR; /* last LCR value received */ __u8 shadowLCR; /* last LCR value received */
__u8 shadowMCR; /* last MCR value received */ __u8 shadowMCR; /* last MCR value received */
char open; char open;
...@@ -478,7 +477,6 @@ static void mos7840_control_callback(struct urb *urb) ...@@ -478,7 +477,6 @@ static void mos7840_control_callback(struct urb *urb)
struct moschip_port *mos7840_port; struct moschip_port *mos7840_port;
struct device *dev = &urb->dev->dev; struct device *dev = &urb->dev->dev;
__u8 regval = 0x0; __u8 regval = 0x0;
int result = 0;
int status = urb->status; int status = urb->status;
mos7840_port = urb->context; mos7840_port = urb->context;
...@@ -495,7 +493,7 @@ static void mos7840_control_callback(struct urb *urb) ...@@ -495,7 +493,7 @@ static void mos7840_control_callback(struct urb *urb)
return; return;
default: default:
dev_dbg(dev, "%s - nonzero urb status received: %d\n", __func__, status); dev_dbg(dev, "%s - nonzero urb status received: %d\n", __func__, status);
goto exit; return;
} }
dev_dbg(dev, "%s urb buffer size is %d\n", __func__, urb->actual_length); dev_dbg(dev, "%s urb buffer size is %d\n", __func__, urb->actual_length);
...@@ -508,16 +506,6 @@ static void mos7840_control_callback(struct urb *urb) ...@@ -508,16 +506,6 @@ static void mos7840_control_callback(struct urb *urb)
mos7840_handle_new_msr(mos7840_port, regval); mos7840_handle_new_msr(mos7840_port, regval);
else if (mos7840_port->MsrLsr == 1) else if (mos7840_port->MsrLsr == 1)
mos7840_handle_new_lsr(mos7840_port, regval); mos7840_handle_new_lsr(mos7840_port, regval);
exit:
spin_lock(&mos7840_port->pool_lock);
if (!mos7840_port->zombie)
result = usb_submit_urb(mos7840_port->int_urb, GFP_ATOMIC);
spin_unlock(&mos7840_port->pool_lock);
if (result) {
dev_err(dev, "%s - Error %d submitting interrupt urb\n",
__func__, result);
}
} }
static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg, static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册