USB: usb-storage: merge ATAPI and QIC-157 protocol routines

[linux-2.6-omap-h63xx.git] / drivers / usb / storage / usb.c

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index cdd009fae3cdf2c60838d73e90ab2850c6427e2a..06c735703f4a4246b94b3312fef2a5d0351e3bf2 100644 (file)
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -704,19 +704,19 @@ static int get_protocol(struct us_data *us)
 
        case US_SC_8020:
                us->protocol_name = "8020i";
-               us->proto_handler = usb_stor_ATAPI_command;
+               us->proto_handler = usb_stor_pad12_command;
                us->max_lun = 0;
                break;
 
        case US_SC_QIC:
                us->protocol_name = "QIC-157";
-               us->proto_handler = usb_stor_qic157_command;
+               us->proto_handler = usb_stor_pad12_command;
                us->max_lun = 0;
                break;
 
        case US_SC_8070:
                us->protocol_name = "8070i";
-               us->proto_handler = usb_stor_ATAPI_command;
+               us->proto_handler = usb_stor_pad12_command;
                us->max_lun = 0;
                break;