Skip to content

Commit f50d5e0

Browse files
dpenklergregkh
authored andcommitted
staging: gpib: Add init response codes for new ni-usb-hs+
A new version of a bona fide genuine NI-USB-HS+ adaptor sends new response codes to the initialization sequence. Add the checking for these response codes to suppress console warning messages. Signed-off-by: Dave Penkler <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent c5647e0 commit f50d5e0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/staging/gpib/ni_usb/ni_usb_gpib.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2079,10 +2079,10 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
20792079
}
20802080
if (buffer[++j] != 0x0) { // [6]
20812081
ready = 1;
2082-
// NI-USB-HS+ sends 0xf here
2082+
// NI-USB-HS+ sends 0xf or 0x19 here
20832083
if (buffer[j] != 0x2 && buffer[j] != 0xe && buffer[j] != 0xf &&
2084-
buffer[j] != 0x16) {
2085-
dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=0x%x, expected 0x2, 0xe, 0xf or 0x16\n",
2084+
buffer[j] != 0x16 && buffer[j] != 0x19) {
2085+
dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=0x%x, expected 0x2, 0xe, 0xf, 0x16 or 0x19\n",
20862086
j, (int)buffer[j]);
20872087
unexpected = 1;
20882088
}
@@ -2110,11 +2110,11 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
21102110
j, (int)buffer[j]);
21112111
unexpected = 1;
21122112
}
2113-
if (buffer[++j] != 0x0) {
2113+
if (buffer[++j] != 0x0) { // [10] MC usb-488 sends 0x7 here, new HS+ sends 0x59
21142114
ready = 1;
2115-
if (buffer[j] != 0x96 && buffer[j] != 0x7 && buffer[j] != 0x6e) {
2116-
// [10] MC usb-488 sends 0x7 here
2117-
dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=0x%x, expected 0x96, 0x07 or 0x6e\n",
2115+
if (buffer[j] != 0x96 && buffer[j] != 0x7 && buffer[j] != 0x6e &&
2116+
buffer[j] != 0x59) {
2117+
dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=0x%x, expected 0x96, 0x07, 0x6e or 0x59\n",
21182118
j, (int)buffer[j]);
21192119
unexpected = 1;
21202120
}

0 commit comments

Comments
 (0)