1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 614ecdbb4ab7..933268b8d6a5 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -265,6 +265,7 @@
 /* #define ERRLOGMASK (CD_WARNING|CD_OPEN|CD_COUNT_TRACKS|CD_CLOSE) */
 /* #define ERRLOGMASK (CD_WARNING|CD_REG_UNREG|CD_DO_IOCTL|CD_OPEN|CD_CLOSE|CD_COUNT_TRACKS) */
 
+#include <linux/atomic.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/major.h>
@@ -3692,9 +3693,9 @@ static struct ctl_table_header *cdrom_sysctl_header;
 
 static void cdrom_sysctl_register(void)
 {
-        static int initialized;
+        static atomic_t initialized = ATOMIC_INIT(0);
 
-        if (initialized == 1)
+        if (!atomic_add_unless(&initialized, 1, 1))
                 return;
 
         cdrom_sysctl_header = register_sysctl_table(cdrom_root_table);
@@ -3705,8 +3706,6 @@ static void cdrom_sysctl_register(void)
         cdrom_sysctl_settings.debug = debug;
         cdrom_sysctl_settings.lock = lockdoor;
         cdrom_sysctl_settings.check = check_media_type;
-
-        initialized = 1;
 }
 
 static void cdrom_sysctl_unregister(void)