diff --git a/drivers/staging/greybus/audio-gb-cmds.c b/drivers/staging/greybus/audio-gb-cmds.c
index 73f47d84f1aa..9dbde0d07a49 100644
--- a/drivers/staging/greybus/audio-gb-cmds.c
+++ b/drivers/staging/greybus/audio-gb-cmds.c
@@ -177,15 +177,8 @@ int gb_i2s_mgmt_set_cfg(struct gb_snd *snd_dev, int rate, int chans,
 	set_cfg.config.ll_wclk_rx_edge = GB_I2S_MGMT_EDGE_FALLING;
 
 	ret = gb_i2s_mgmt_set_configuration(snd_dev->mgmt_connection, &set_cfg);
-	if (ret) {
-		pr_err("set_configuration failed: %d\n", ret);
-		return ret;
-	}
-
-	ret = gb_i2s_mgmt_set_samples_per_message(snd_dev->mgmt_connection,
-						  CONFIG_SAMPLES_PER_MSG);
 	if (ret)
-		pr_err("set_samples_per_msg failed: %d\n", ret);
+		pr_err("set_configuration failed: %d\n", ret);
 
 	return ret;
 }
diff --git a/drivers/staging/greybus/audio.c b/drivers/staging/greybus/audio.c
index a1acbb039777..76b6bdc59847 100644
--- a/drivers/staging/greybus/audio.c
+++ b/drivers/staging/greybus/audio.c
@@ -292,6 +292,13 @@ static int gb_i2s_mgmt_connection_init(struct gb_connection *connection)
 		goto err_free_snd_dev;
 	}
 
+	ret = gb_i2s_mgmt_set_samples_per_message(snd_dev->mgmt_connection,
+						  CONFIG_SAMPLES_PER_MSG);
+	if (ret) {
+		pr_err("set_samples_per_msg failed: %d\n", ret);
+		goto err_free_i2s_configs;
+	}
+
 	snd_dev->send_data_req_buf = kzalloc(SEND_DATA_BUF_LEN, GFP_KERNEL);
 
 	if (!snd_dev->send_data_req_buf) {