diff --git a/fl2000_drm.c b/fl2000_drm.c
index e7f7f93..009d78e 100644
--- a/fl2000_drm.c
+++ b/fl2000_drm.c
@@ -25,7 +25,7 @@ static const u32 fl2000_pixel_formats[] = {
 };
 
 /* IT66121 HDMI bridge driver name*/
-static const char *const fl2000_supported_bridge = "it66121";
+static const char *fl2000_supported_bridge = "it66121";
 
 /* Maximum pixel clock set to 500MHz. It is hard to get more or less precise PLL configuration for
  * higher clock
@@ -459,7 +459,7 @@ void fl2000_drm_vblank(struct usb_device *usb_dev)
 	if (!drm_if->vblank_enabled)
 		return;
 
-	crtc = &drm_if->pipe->crtc;
+	crtc = &drm_if->pipe.crtc;
 	ret = drm_crtc_handle_vblank(crtc);
 	if (ret)
 		dev_err(&usb_dev->dev, "Cannot handle vblank event (%d)", ret);
@@ -601,14 +601,13 @@ int fl2000_drm_init(struct usb_device *usb_dev)
 	drm_encoder_helper_add(&drm_if->pipe.encoder, &fl2000_encoder_funcs);
 
 	/* Register supported HDMI bridge as a component with match by name */
-	ret = component_match_add(&usb_dev->dev, &match, component_compare_dev_name, fl2000_supported_bridge);
-	if (ret) {
-		dev_err(&usb_dev->dev, "Cannot add component match! (%d)", ret);
+	component_match_add(&usb_dev->dev, &match, component_compare_dev_name, fl2000_supported_bridge);
+	if (!match) {
+		dev_err(&usb_dev->dev, "Cannot find supported HDMI bridge!");
 		drm_mode_config_cleanup(drm);
 		drm_dev_put(drm);
-		return ret;
+		return -ENODEV;
 	}
-
 	/* Register component master - component bind/unbind functions will complete the registration
 	 * and initializtion of DRM device chain
 	 */