mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 08:44:21 +08:00
[PATCH] serial_cs device identification fix
serial_cs's vendor/device identification got broken by Yum Rayan's change '[PATCH] serial_cs: Reduce stack usage in serial_event()' - it changed buf type from u_short* to char*, breaking device manufacturer & card number retrieval. Due to this my modem stopped from being recognized as special case. Code will work much better if we'll rely on first_tuple's parser instead of doing parse ourselves. Code also looks simpler after change. Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
4f167fb491
commit
f1fc3990e2
@ -661,10 +661,10 @@ void serial_config(dev_link_t * link)
|
||||
/* Is this a multiport card? */
|
||||
tuple->DesiredTuple = CISTPL_MANFID;
|
||||
if (first_tuple(handle, tuple, parse) == CS_SUCCESS) {
|
||||
info->manfid = le16_to_cpu(buf[0]);
|
||||
info->manfid = parse->manfid.manf;
|
||||
for (i = 0; i < MULTI_COUNT; i++)
|
||||
if ((info->manfid == multi_id[i].manfid) &&
|
||||
(le16_to_cpu(buf[1]) == multi_id[i].prodid))
|
||||
(parse->manfid.card == multi_id[i].prodid))
|
||||
break;
|
||||
if (i < MULTI_COUNT)
|
||||
info->multi = multi_id[i].multi;
|
||||
|
Loading…
Reference in New Issue
Block a user