2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 3733e36d135e..b06a53715853 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -183,6 +183,10 @@ int drm_stub_open(struct inode *inode, struct file *filp)
 
         old_fops = filp->f_op;
         filp->f_op = fops_get(&dev->driver->fops);
+        if (filp->f_op == NULL) {
+                filp->f_op = old_fops;
+                goto out;
+        }
         if (filp->f_op->open && (err = filp->f_op->open(inode, filp))) {
                 fops_put(filp->f_op);
                 filp->f_op = fops_get(old_fops);
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 65d72d094c81..5aa6780652aa 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -488,7 +488,7 @@ int drm_sysfs_device_add(struct drm_minor *minor)
         else
                 minor_str = "card%d";
 
-        snprintf(minor->kdev.bus_id, BUS_ID_SIZE, minor_str, minor->index);
+        dev_set_name(&minor->kdev, minor_str, minor->index);
 
         err = device_register(&minor->kdev);
         if (err) {