diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index 3a17db91a167..810c61807c0a 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -150,6 +150,7 @@ _gb_connection_create(struct gb_host_device *hd, int hd_cport_id,
 				unsigned long flags)
 {
 	struct gb_connection *connection;
+	unsigned long irqflags;
 	int ret;
 
 	mutex_lock(&gb_connection_mutex);
@@ -200,7 +201,7 @@ _gb_connection_create(struct gb_host_device *hd, int hd_cport_id,
 
 	gb_connection_init_name(connection);
 
-	spin_lock_irq(&gb_connections_lock);
+	spin_lock_irqsave(&gb_connections_lock, irqflags);
 	list_add(&connection->hd_links, &hd->connections);
 
 	if (bundle)
@@ -208,7 +209,7 @@ _gb_connection_create(struct gb_host_device *hd, int hd_cport_id,
 	else
 		INIT_LIST_HEAD(&connection->bundle_links);
 
-	spin_unlock_irq(&gb_connections_lock);
+	spin_unlock_irqrestore(&gb_connections_lock, irqflags);
 
 	mutex_unlock(&gb_connection_mutex);
 
@@ -849,6 +850,8 @@ EXPORT_SYMBOL_GPL(gb_connection_disable_forced);
 /* Caller must have disabled the connection before destroying it. */
 void gb_connection_destroy(struct gb_connection *connection)
 {
+	unsigned long flags;
+
 	if (!connection)
 		return;
 
@@ -857,10 +860,10 @@ void gb_connection_destroy(struct gb_connection *connection)
 
 	mutex_lock(&gb_connection_mutex);
 
-	spin_lock_irq(&gb_connections_lock);
+	spin_lock_irqsave(&gb_connections_lock, flags);
 	list_del(&connection->bundle_links);
 	list_del(&connection->hd_links);
-	spin_unlock_irq(&gb_connections_lock);
+	spin_unlock_irqrestore(&gb_connections_lock, flags);
 
 	destroy_workqueue(connection->wq);