Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[firefly-linux-kernel-4.4.55.git] / drivers / char / sx.c

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index a6b4f02bdceb06ba347d5241f6b479eacecbb36a..76b9107f7f814b53bda55814e3d5e8d890b02b44 100644 (file)
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2318,9 +2318,9 @@ static int sx_init_portstructs (int nboards, int nports)
                        port->board = board;
                        port->gs.rd = &sx_real_driver;
 #ifdef NEW_WRITE_LOCKING
-                       port->gs.port_write_sem = MUTEX;
+                       port->gs.port_write_mutex = MUTEX;
 #endif
-                       port->gs.driver_lock = SPIN_LOCK_UNLOCKED;
+                       spin_lock_init(&port->gs.driver_lock);
                        /*
                         * Initializing wait queue
                         */