summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenkatraman S <svenkatr@ti.com>2012-04-05 21:14:28 +0530
committerVenkatraman S <svenkatr@ti.com>2012-04-10 19:04:12 +0530
commitb5854e97bdda0939f6a52b2d3c4440845f3c187e (patch)
tree55c3934a0f71e5b3a4cb1c9f53a92c5e5bdfe1b9
parent258f742635360175564e9470eb060ff4d4b984e7 (diff)
downloadlinux-topics-b5854e97bdda0939f6a52b2d3c4440845f3c187e.tar.gz
scsi/ufs: reverse the ufshcd_is_device_present logic
Otherwise it counter intuitively returns 0 if device is present. Signed-off-by: Venkatraman S <svenkatr@ti.com> CC: Santosh Y <santoshsy@gmail.com> CC: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--drivers/scsi/ufs/ufshcd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 52b96e8bf92..aa972004412 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/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;