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

Commit 52b0ace7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
  ALSA: snd-usb-caiaq: Bump version number to 1.3.21
  ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"
  ALSA: snd-usb-caiaq: Simplify single case to an 'if'
  ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ
  ALSA: hda: Use LPIB for a Shuttle device
  ALSA: hda: Add support for another Lenovo ThinkPad Edge in conexant codec
  ALSA: hda: Use LPIB for Sony VPCS11V9E
  ALSA: usb-audio: fix feature unit parser for UAC2
  ALSA: asihpi - Minor code cleanup
  ALSA: asihpi - Add support for new ASI8800 family
  ALSA: asihpi - Fix bug preventing outstream_write preload from happening
  ALSA: asihpi - Fix imbalanced lock path in hw_message
  ALSA: asihpi - Remove support for old ASI8800 family
  ALSA: asihpi - Add hd radio blend functions
  ALSA: asihpi - Remove unused io map functions
  ALSA: usb-audio: add support for UAC2 pitch control
  ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
  ALSA: usb-audio: fix return values
  ALSA: usb-audio: parse more format descriptors with structs
  sound: Add missing spin_unlock
  ...
parents 24010e46 d6695f09

include/linux/usb/audio-v2.h

+16 −0
Original line number Diff line number Diff line
@@ -105,6 +105,22 @@ struct uac_as_header_descriptor_v2 { 
	__u8 iChannelNames;

} __attribute__((packed));



/* 4.10.1.2 Class-Specific AS Isochronous Audio Data Endpoint Descriptor */



struct uac2_iso_endpoint_descriptor {

	__u8  bLength;			/* in bytes: 8 */

	__u8  bDescriptorType;		/* USB_DT_CS_ENDPOINT */

	__u8  bDescriptorSubtype;	/* EP_GENERAL */

	__u8  bmAttributes;

	__u8  bmControls;

	__u8  bLockDelayUnits;

	__le16 wLockDelay;

} __attribute__((packed));



#define UAC2_CONTROL_PITCH		(3 << 0)

#define UAC2_CONTROL_DATA_OVERRUN	(3 << 2)

#define UAC2_CONTROL_DATA_UNDERRUN	(3 << 4)



/* 6.1 Interrupt Data Message */



#define UAC2_INTERRUPT_DATA_MSG_VENDOR	(1 << 0)

sound/mips/au1x00.c

+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ get the interrupt driven case to work efficiently */ 
			break;

	if (i == 0x5000) {

		printk(KERN_ERR "au1000 AC97: AC97 command read timeout\n");

		spin_unlock(&au1000->ac97_lock);

		return 0;

	}

sound/oss/dmasound/dmasound_atari.c

+3 −2
Original line number Diff line number Diff line
@@ -1277,7 +1277,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy) 
		 * (almost) like on the TT.

		 */

		write_sq_ignore_int = 0;

		return IRQ_HANDLED;

		goto out;

	}



	if (!write_sq.active) {
@@ -1285,7 +1285,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy) 
		 * the sq variables, so better don't do anything here.

		 */

		WAKE_UP(write_sq.sync_queue);

		return IRQ_HANDLED;

		goto out;

	}



	/* Probably ;) one frame is finished. Well, in fact it may be that a
@@ -1322,6 +1322,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy) 
	/* We are not playing after AtaPlay(), so there

	   is nothing to play any more. Wake up a process

	   waiting for audio output to drain. */

out:

	spin_unlock(&dmasound.lock);

	return IRQ_HANDLED;

}

sound/pci/asihpi/hpi.h

+7 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ i.e 3.05.02 is a development version 
#define HPI_VER_RELEASE(v) ((int)(v & 0xFF))



/* Use single digits for versions less that 10 to avoid octal. */

#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 3, 18)

#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 3, 25)



/* Library version as documented in hpi-api-versions.txt */

#define HPI_LIB_VER  HPI_VERSION_CONSTRUCTOR(9, 0, 0)
@@ -1632,6 +1632,12 @@ u16 hpi_tuner_get_hd_radio_sdk_version(const struct hpi_hsubsys *ph_subsys, 
u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys,

	u32 h_control, u32 *pquality);



u16 hpi_tuner_get_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,

	u32 h_control, u32 *pblend);



u16 hpi_tuner_set_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,

	u32 h_control, const u32 blend);



/****************************/

/* PADs control             */

/****************************/

sound/pci/asihpi/hpi6000.c

+2 −4
Original line number Diff line number Diff line
@@ -691,9 +691,6 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, 
	case 0x6200:

		boot_load_family = HPI_ADAPTER_FAMILY_ASI(0x6200);

		break;

	case 0x8800:

		boot_load_family = HPI_ADAPTER_FAMILY_ASI(0x8800);

		break;

	default:

		return HPI6000_ERROR_UNHANDLED_SUBSYS_ID;

	}
@@ -1775,7 +1772,6 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm, 
	u16 error = 0;

	u16 dsp_index = 0;

	u16 num_dsp = ((struct hpi_hw_obj *)pao->priv)->num_dsp;

	hpios_dsplock_lock(pao);



	if (num_dsp < 2)

		dsp_index = 0;
@@ -1796,6 +1792,8 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm, 
			}

		}

	}



	hpios_dsplock_lock(pao);

	error = hpi6000_message_response_sequence(pao, dsp_index, phm, phr);



	/* maybe an error response */