From 2681770b02771029bbf08989c5f01da2f0b7c01b Mon Sep 17 00:00:00 2001
From: Venkatraman S <svenkatr@ti.com>
Date: Tue, 10 Jul 2012 19:39:23 +0530
Subject: [PATCH] --- yaml --- r: 316834 b: refs/heads/master c:
 73ec513a3b1fa89d3cbaf0bc7dcc3a2b67936f2a h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/ufs/ufshcd.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dd4b716bced4..c84ab8572a8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17ccafc4ef00716d022cac9ff64cef0aafe7c02a
+refs/heads/master: 73ec513a3b1fa89d3cbaf0bc7dcc3a2b67936f2a
diff --git a/trunk/drivers/scsi/ufs/ufshcd.c b/trunk/drivers/scsi/ufs/ufshcd.c
index 40c43bfce681..48b01fe0b9ba 100644
--- a/trunk/drivers/scsi/ufs/ufshcd.c
+++ b/trunk/drivers/scsi/ufs/ufshcd.c
@@ -232,11 +232,11 @@ static inline u32 ufshcd_get_ufs_version(struct ufs_hba *hba)
  *			      the host controller
  * @reg_hcs - host controller status register value
  *
- * Returns 0 if device present, non-zero if no device detected
+ * Returns 1 if device present, 0 if no device detected
  */
 static inline int ufshcd_is_device_present(u32 reg_hcs)
 {
-	return (DEVICE_PRESENT & reg_hcs) ? 0 : -1;
+	return (DEVICE_PRESENT & reg_hcs) ? 1 : 0;
 }
 
 /**
@@ -911,7 +911,7 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
 
 	/* check if device present */
 	reg = readl((hba->mmio_base + REG_CONTROLLER_STATUS));
-	if (ufshcd_is_device_present(reg)) {
+	if (!ufshcd_is_device_present(reg)) {
 		dev_err(&hba->pdev->dev, "cc: Device not present\n");
 		err = -ENXIO;
 		goto out;