]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[SCSI] ufs: reverse the ufshcd_is_device_present logic
authorVenkatraman S <svenkatr@ti.com>
Tue, 10 Jul 2012 14:09:23 +0000 (19:39 +0530)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 20 Jul 2012 07:59:01 +0000 (08:59 +0100)
Otherwise it counter intuitively returns 0 if device is present.

Signed-off-by: Venkatraman S <svenkatr@ti.com>
Reviewed-by: Namjae Jeon <linkinjeon@gmail.com>
Acked-by: Santosh Y <santoshsy@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/ufs/ufshcd.c

index 40c43bfce681bd714a99fa65ecfdf0d193573c52..48b01fe0b9ba976ee02557a7773c17264068f17a 100644 (file)
@@ -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;