2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/hid/hid-picolcd_cir.c b/drivers/hid/hid-picolcd_cir.c
index e346038f0f11..59d5eb1e742c 100644
--- a/drivers/hid/hid-picolcd_cir.c
+++ b/drivers/hid/hid-picolcd_cir.c
@@ -145,6 +145,7 @@ void picolcd_exit_cir(struct picolcd_data *data)
         struct rc_dev *rdev = data->rc_dev;
 
         data->rc_dev = NULL;
-        rc_unregister_device(rdev);
+        if (rdev)
+                rc_unregister_device(rdev);
 }
 
diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c
index 591f6b22aa94..c930ab8554ea 100644
--- a/drivers/hid/hid-picolcd_fb.c
+++ b/drivers/hid/hid-picolcd_fb.c
@@ -593,10 +593,14 @@ err_nomem:
 void picolcd_exit_framebuffer(struct picolcd_data *data)
 {
         struct fb_info *info = data->fb_info;
-        struct picolcd_fb_data *fbdata = info->par;
+        struct picolcd_fb_data *fbdata;
         unsigned long flags;
 
+        if (!info)
+                return;
+
         device_remove_file(&data->hdev->dev, &dev_attr_fb_update_rate);
+        fbdata = info->par;
 
         /* disconnect framebuffer from HID dev */
         spin_lock_irqsave(&fbdata->lock, flags);