diff options
| author | Alexey Sokolov <sokolov@7pikes.com> | 2015-06-02 11:49:30 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:14 +0200 |
| commit | 01adf72acad2bdb805fc86c3af939cc46e7e33fd (patch) | |
| tree | 88b3253ff99f100dd114c929d55be2a036f21058 /drivers/usb | |
| parent | 0253429b31c2286d1c4eddc9762fa0d9f64f49b3 (diff) | |
| download | kernel_samsung_smdk4412-01adf72acad2bdb805fc86c3af939cc46e7e33fd.zip kernel_samsung_smdk4412-01adf72acad2bdb805fc86c3af939cc46e7e33fd.tar.gz kernel_samsung_smdk4412-01adf72acad2bdb805fc86c3af939cc46e7e33fd.tar.bz2 | |
cdc-acm: Add support of ATOL FPrint fiscal printers
commit 15bf722e6f6c0b884521a0363204532e849deb7f upstream.
ATOL FPrint fiscal printers require usb_clear_halt to be executed
to work properly. Add quirk to fix the issue.
Signed-off-by: Alexey Sokolov <sokolov@7pikes.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 9 | ||||
| -rw-r--r-- | drivers/usb/class/cdc-acm.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 57d6302..ca666d0 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1295,6 +1295,11 @@ skip_countries: acm_table[minor] = acm; + if (quirks & CLEAR_HALT_CONDITIONS) { + usb_clear_halt(usb_dev, usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress)); + usb_clear_halt(usb_dev, usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress)); + } + return 0; alloc_fail7: for (i = 0; i < ACM_NW; i++) @@ -1574,6 +1579,10 @@ static const struct usb_device_id acm_ids[] = { .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ }, + { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */ + .driver_info = CLEAR_HALT_CONDITIONS, + }, + /* Nokia S60 phones expose two ACM channels. The first is * a modem and is picked up by the standard AT-command * information below. The second is 'vendor-specific' but diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index c3f1b36..7aa5e9a 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h @@ -127,3 +127,4 @@ struct acm { #define NO_CAP_LINE 4 #define NOT_A_MODEM 8 #define NO_DATA_INTERFACE 16 +#define CLEAR_HALT_CONDITIONS BIT(7) |