5.9.6
This commit is contained in:
@@ -767,25 +767,3 @@ index 6f12bab4d2fa..610ed0817bd7 100644
|
||||
hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) {
|
||||
return 0x00;
|
||||
}
|
||||
diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c
|
||||
index 2c5c451fa19d7..c475955c6eeba 100644
|
||||
--- a/sound/soc/sof/intel/hda-codec.c
|
||||
+++ b/sound/soc/sof/intel/hda-codec.c
|
||||
@@ -151,7 +151,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address,
|
||||
if (!hdev->bus->audio_component) {
|
||||
dev_dbg(sdev->dev,
|
||||
"iDisp hw present but no driver\n");
|
||||
- goto error;
|
||||
+ return -ENOENT;
|
||||
}
|
||||
hda_priv->need_display_power = true;
|
||||
}
|
||||
@@ -174,7 +174,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address,
|
||||
* other return codes without modification
|
||||
*/
|
||||
if (ret == 0)
|
||||
- goto error;
|
||||
+ ret = -ENOENT;
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user