From a3555d56b4b3b539fd42288c0616191639c826b0 Mon Sep 17 00:00:00 2001
From: Vishal Verma <vishal.l.verma@linux.intel.com>
Date: Mon, 13 May 2013 14:55:18 -0600
Subject: [PATCH] --- yaml --- r: 376924 b: refs/heads/master c:
 710a143dd870cd660b5ae26bb94b6da854376e91 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/block/nvme-scsi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d9f3fc8b8211..5099c5c91cad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76e0310c2d5a4fb62f674af7dad16f544950fc13
+refs/heads/master: 710a143dd870cd660b5ae26bb94b6da854376e91
diff --git a/trunk/drivers/block/nvme-scsi.c b/trunk/drivers/block/nvme-scsi.c
index 64bde6886b43..102de2f52b5c 100644
--- a/trunk/drivers/block/nvme-scsi.c
+++ b/trunk/drivers/block/nvme-scsi.c
@@ -1653,7 +1653,7 @@ static void nvme_trans_modesel_save_bd(struct nvme_ns *ns, u8 *parm_list,
 	}
 }
 
-static u16 nvme_trans_modesel_get_mp(struct nvme_ns *ns, struct sg_io_hdr *hdr,
+static int nvme_trans_modesel_get_mp(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 					u8 *mode_page, u8 page_code)
 {
 	int res = SNTI_TRANSLATION_SUCCESS;