diff --git a/[refs] b/[refs]
index 74b2de10ab11..e43afee6bdab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f46902371c50f72ef422e19119b8e3c0b0b3ef6
+refs/heads/master: 41098f8f1473cf853125d2fde2ce936879ef1adc
diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c
index 1f9d23e48b2a..ae8c33e7849c 100644
--- a/trunk/drivers/staging/hv/storvsc_drv.c
+++ b/trunk/drivers/staging/hv/storvsc_drv.c
@@ -522,8 +522,9 @@ static void storvsc_on_io_completion(struct hv_device *device,
 		if (vstor_packet->vm_srb.srb_status & 0x80) {
 			/* autosense data available */
 			dev_warn(&device->device,
-				 "storvsc pkt %p autosense data valid - len %d\n",
-				 request, vstor_packet->vm_srb.sense_info_length);
+				 "stor pkt %p autosense data valid - len %d\n",
+				 request,
+				 vstor_packet->vm_srb.sense_info_length);
 
 			memcpy(request->sense_buffer,
 			       vstor_packet->vm_srb.sense_data,
@@ -1128,13 +1129,13 @@ static bool storvsc_check_scsi_cmd(struct scsi_cmnd *scmnd)
 	u8 scsi_op = scmnd->cmnd[0];
 
 	switch (scsi_op) {
-		/* smartd sends this command, which will offline the device */
-		case SET_WINDOW:
-			scmnd->result = DID_ERROR << 16;
-			allowed = false;
-			break;
-		default:
-			break;
+	/* smartd sends this command, which will offline the device */
+	case SET_WINDOW:
+		scmnd->result = DID_ERROR << 16;
+		allowed = false;
+		break;
+	default:
+		break;
 	}
 	return allowed;
 }