Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593bc3b7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sound: usb: Add default branches for BADD 3.0 devices"

parents 2cc0f28c 2ecf8c9f

sound/usb/format.c

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, 
			sample_bytes = SUBSLOTSIZE_24_BIT;

			break;

		}



		default:

			usb_audio_err(chip, "%u:%d : Invalid wMaxPacketSize\n",

				      fp->iface, fp->altsetting);

			return pcm_formats;

		}

		format = 1 << format;

		break;

sound/usb/mixer.c

+4 −0
Original line number Diff line number Diff line
@@ -1632,6 +1632,10 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, 
				break;

			}

			break;



		default:

			usb_audio_err(state->chip, "Invalid unit %u\n", unitid);

			return -EINVAL;

		}

	}

sound/usb/usb_audio_qmi_svc.c

+6 −0
Original line number Diff line number Diff line
@@ -497,6 +497,12 @@ static int prepare_qmi_response(struct snd_usb_substream *subs, 
			resp->usb_audio_subslot_size = SUBSLOTSIZE_24_BIT;

			break;

		}



		default:

			pr_err("%d: %u: Invalid wMaxPacketSize\n",

				subs->interface, subs->altset_idx);

			ret = -EINVAL;

			goto err;

		}

		resp->usb_audio_subslot_size_valid = 1;

	} else {