|
|
@@ -401,7 +401,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
|
|
|
struct smsusb_device_t *dev;
|
|
|
void *mdev;
|
|
|
int i, rc;
|
|
|
- int in_maxp = 0;
|
|
|
+ int align = 0;
|
|
|
|
|
|
/* create device object */
|
|
|
dev = kzalloc(sizeof(struct smsusb_device_t), GFP_KERNEL);
|
|
|
@@ -419,14 +419,14 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
|
|
|
|
|
|
if (desc->bEndpointAddress & USB_DIR_IN) {
|
|
|
dev->in_ep = desc->bEndpointAddress;
|
|
|
- in_maxp = usb_endpoint_maxp(desc);
|
|
|
+ align = usb_endpoint_maxp(desc) - sizeof(struct sms_msg_hdr);
|
|
|
} else {
|
|
|
dev->out_ep = desc->bEndpointAddress;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
pr_debug("in_ep = %02x, out_ep = %02x\n", dev->in_ep, dev->out_ep);
|
|
|
- if (!dev->in_ep || !dev->out_ep) { /* Missing endpoints? */
|
|
|
+ if (!dev->in_ep || !dev->out_ep || align < 0) { /* Missing endpoints? */
|
|
|
smsusb_term_device(intf);
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
@@ -445,7 +445,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
|
|
|
/* fall-thru */
|
|
|
default:
|
|
|
dev->buffer_size = USB2_BUFFER_SIZE;
|
|
|
- dev->response_alignment = in_maxp - sizeof(struct sms_msg_hdr);
|
|
|
+ dev->response_alignment = align;
|
|
|
|
|
|
params.flags |= SMS_DEVICE_FAMILY2;
|
|
|
break;
|