diff --git a/[refs] b/[refs]
index 2aa3f5348bd2..ebe11e46cf68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 578fcb8e5f3046493932105c404792a2fe0e066f
+refs/heads/master: 90dc4cfa2076cdc4df4c2f5dd3cadeefd9557c2c
diff --git a/trunk/drivers/media/IR/lirc_dev.c b/trunk/drivers/media/IR/lirc_dev.c
index 560c35609ca4..19a16cef7d65 100644
--- a/trunk/drivers/media/IR/lirc_dev.c
+++ b/trunk/drivers/media/IR/lirc_dev.c
@@ -397,7 +397,7 @@ int lirc_unregister_driver(int minor)
 		wake_up_interruptible(&ir->buf->wait_poll);
 		mutex_lock(&ir->irctl_lock);
 		ir->d.set_use_dec(ir->d.data);
-		module_put(ir->d.owner);
+		module_put(ir->cdev.owner);
 		mutex_unlock(&ir->irctl_lock);
 		cdev_del(&ir->cdev);
 	} else {
@@ -446,12 +446,12 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file)
 		goto error;
 	}
 
-	if (try_module_get(ir->d.owner)) {
+	if (try_module_get(ir->cdev.owner)) {
 		++ir->open;
 		retval = ir->d.set_use_inc(ir->d.data);
 
 		if (retval) {
-			module_put(ir->d.owner);
+			module_put(ir->cdev.owner);
 			--ir->open;
 		} else {
 			lirc_buffer_clear(ir->buf);
@@ -482,7 +482,7 @@ int lirc_dev_fop_close(struct inode *inode, struct file *file)
 	--ir->open;
 	if (ir->attached) {
 		ir->d.set_use_dec(ir->d.data);
-		module_put(ir->d.owner);
+		module_put(ir->cdev.owner);
 	} else {
 		lirc_irctl_cleanup(ir);
 		irctls[ir->d.minor] = NULL;