Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 165005
b: refs/heads/master
c: 877accc
h: refs/heads/master
i:
  165003: 71cc827
v: v3
  • Loading branch information
Oliver Neukum authored and Greg Kroah-Hartman committed Sep 23, 2009
1 parent 55d08e2 commit fb40fbe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e8dce065088833fc418bfa5fbf035cb0726c04c
refs/heads/master: 877accca79b706afe5d78b9a92cf4f22919fb2b0
37 changes: 0 additions & 37 deletions trunk/drivers/usb/image/microtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -653,33 +653,6 @@ static struct scsi_host_template mts_scsi_host_template = {
.max_sectors= 256, /* 128 K */
};

struct vendor_product
{
char* name;
enum
{
mts_sup_unknown=0,
mts_sup_alpha,
mts_sup_full
}
support_status;
} ;


/* These are taken from the msmUSB.inf file on the Windows driver CD */
static const struct vendor_product mts_supported_products[] =
{
{ "Phantom 336CX", mts_sup_unknown},
{ "Phantom 336CX", mts_sup_unknown},
{ "Scanmaker X6", mts_sup_alpha},
{ "Phantom C6", mts_sup_unknown},
{ "Phantom 336CX", mts_sup_unknown},
{ "ScanMaker V6USL", mts_sup_unknown},
{ "ScanMaker V6USL", mts_sup_unknown},
{ "Scanmaker V6UL", mts_sup_unknown},
{ "Scanmaker V6UPL", mts_sup_alpha},
};

/* The entries of microtek_table must correspond, line-by-line to
the entries of mts_supported_products[]. */

Expand Down Expand Up @@ -711,7 +684,6 @@ static int mts_usb_probe(struct usb_interface *intf,
int err_retval = -ENOMEM;

struct mts_desc * new_desc;
struct vendor_product const* p;
struct usb_device *dev = interface_to_usbdev (intf);

/* the current altsetting on the interface we're probing */
Expand All @@ -726,15 +698,6 @@ static int mts_usb_probe(struct usb_interface *intf,

MTS_DEBUG_GOT_HERE();

p = &mts_supported_products[id - mts_usb_ids];

MTS_DEBUG_GOT_HERE();

MTS_DEBUG( "found model %s\n", p->name );
if ( p->support_status != mts_sup_full )
MTS_MESSAGE( "model %s is not known to be fully supported, reports welcome!\n",
p->name );

/* the current altsetting on the interface we're probing */
altsetting = intf->cur_altsetting;

Expand Down

0 comments on commit fb40fbe

Please sign in to comment.