Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / xgifb / XGI_main_26.c

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 5a6251a4511246756d2c6105fd9a382df51c1b42..89f5b55ed546161e378f7871dd34a33910ac5b58 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1548,7 +1548,7 @@ static void XGIfb_detect_VB(struct xgifb_video_info *xgifb_info)
        }
 }
 
-static int XGIfb_has_VB(struct xgifb_video_info *xgifb_info)
+static bool XGIfb_has_VB(struct xgifb_video_info *xgifb_info)
 {
        u8 vb_chipid;
 
@@ -1562,9 +1562,9 @@ static int XGIfb_has_VB(struct xgifb_video_info *xgifb_info)
                break;
        default:
                xgifb_info->hasVB = HASVB_NONE;
-               return 0;
+               return false;
        }
-       return 1;
+       return true;
 }
 
 static void XGIfb_get_VB_type(struct xgifb_video_info *xgifb_info)