Merge tag 'v3.10.108' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / scsi / device_handler / scsi_dh_emc.c

diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index e1c8be06de9de2f50dd608f0ec27f7bf81617adb..f94fcda1285d35e83e7e860c8386d99fb0ab2bb4 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -464,7 +464,7 @@ static int clariion_prep_fn(struct scsi_device *sdev, struct request *req)
 static int clariion_std_inquiry(struct scsi_device *sdev,
                                struct clariion_dh_data *csdev)
 {
-       int err;
+       int err = SCSI_DH_OK;
        char *sp_model;
 
        err = send_inquiry_cmd(sdev, 0, csdev);