@@ -2482,6 +2482,7 @@ static void ata_eh_link_report(struct ata_link *link)
2482
2482
struct ata_queued_cmd * qc = __ata_qc_from_tag (ap , tag );
2483
2483
struct ata_taskfile * cmd = & qc -> tf , * res = & qc -> result_tf ;
2484
2484
const u8 * cdb = qc -> cdb ;
2485
+ size_t cdb_len = qc -> dev -> cdb_len ;
2485
2486
char data_buf [20 ] = "" ;
2486
2487
char cdb_buf [70 ] = "" ;
2487
2488
@@ -2509,16 +2510,12 @@ static void ata_eh_link_report(struct ata_link *link)
2509
2510
}
2510
2511
2511
2512
if (ata_is_atapi (qc -> tf .protocol )) {
2512
- if (qc -> scsicmd )
2513
- scsi_print_command (qc -> scsicmd );
2514
- else
2515
- snprintf (cdb_buf , sizeof (cdb_buf ),
2516
- "cdb %02x %02x %02x %02x %02x %02x %02x %02x "
2517
- "%02x %02x %02x %02x %02x %02x %02x %02x\n " ,
2518
- cdb [0 ], cdb [1 ], cdb [2 ], cdb [3 ],
2519
- cdb [4 ], cdb [5 ], cdb [6 ], cdb [7 ],
2520
- cdb [8 ], cdb [9 ], cdb [10 ], cdb [11 ],
2521
- cdb [12 ], cdb [13 ], cdb [14 ], cdb [15 ]);
2513
+ if (qc -> scsicmd ) {
2514
+ cdb = qc -> scsicmd -> cmnd ;
2515
+ cdb_len = qc -> scsicmd -> cmd_len ;
2516
+ }
2517
+ __scsi_format_command (cdb_buf , sizeof (cdb_buf ),
2518
+ cdb , cdb_len );
2522
2519
} else {
2523
2520
const char * descr = ata_get_cmd_descript (cmd -> command );
2524
2521
if (descr )
0 commit comments