Commit e4ddc9cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (30 commits)
  [ALSA] version 1.0.14rc1
  [ALSA] ac97: Identify CMI9761 chips.
  [ALSA] ac97_codec - trivial fix for bit update functions
  [ALSA] snd-ca0106: Fix typos.
  [ALSA] snd-ca0106: Add new card variant.
  [ALSA] sound: fix PCM substream list
  [ALSA] sound: initialize rawmidi substream list
  [ALSA] snd_hda_intel 3stack mode for ASUS P5P-L2
  [ALSA] Remove IRQF_DISABLED for shared PCI irqs
  [ALSA] Fix invalid assignment of PCI revision
  [ALSA] Fix races in PCM OSS emulation
  [ALSA] hda-codec - fix typo in PCI IDs
  [ALSA] ac97 - Fix potential negative array index
  [ALSA] hda-codec - Verbose proc output for PCM parameters
  [ALSA] hda-codec - Fix detection of supported sample rates
  [ALSA] hda-codec - Fix model for ASUS V1j laptop
  [ALSA] sound/core/control.c: remove dead code
  [ALSA] hda-codec - Add model for HP q965
  [ALSA] pcm core: fix silence_start calculations
  [ALSA] hda-codec - Fix a typo
  ...
parents eb2112fb 7c21699e

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ 
          <informalexample>

            <programlisting>

<![CDATA[

  struct mychip *chip = (struct mychip *)card->private_data;

  struct mychip *chip = card->private_data;

]]>

            </programlisting>

          </informalexample>
@@ -1095,7 +1095,7 @@ 


          /* release the irq */

          if (chip->irq >= 0)

                  free_irq(chip->irq, (void *)chip);

                  free_irq(chip->irq, chip);

          /* release the i/o ports & memory */

          pci_release_regions(chip->pci);

          /* disable the PCI entry */
@@ -1148,7 +1148,7 @@ 
          }

          chip->port = pci_resource_start(pci, 0);

          if (request_irq(pci->irq, snd_mychip_interrupt,

                          IRQF_DISABLED|IRQF_SHARED, "My Chip", chip)) {

                          IRQF_SHARED, "My Chip", chip)) {

                  printk(KERN_ERR "cannot grab irq %d\n", pci->irq);

                  snd_mychip_free(chip);

                  return -EBUSY;
@@ -1387,7 +1387,7 @@ 
          <programlisting>

<![CDATA[

  if (chip->irq >= 0)

          free_irq(chip->irq, (void *)chip);

          free_irq(chip->irq, chip);

]]>

          </programlisting>

        </informalexample>

include/sound/pcm_oss.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct snd_pcm_oss_runtime { 
	size_t mmap_bytes;

	char *buffer;				/* vmallocated period */

	size_t buffer_used;			/* used length from period buffer */

	struct mutex params_lock;

#ifdef CONFIG_SND_PCM_OSS_PLUGINS

	struct snd_pcm_plugin *plugin_first;

	struct snd_pcm_plugin *plugin_last;

include/sound/version.h

+2 −2
Original line number Diff line number Diff line 
/* include/version.h.  Generated by alsa/ksync script.  */

#define CONFIG_SND_VERSION "1.0.13"

#define CONFIG_SND_DATE " (Tue Nov 28 14:07:24 2006 UTC)"
 
#define CONFIG_SND_VERSION "1.0.14rc1"

#define CONFIG_SND_DATE " (Wed Dec 20 08:11:48 2006 UTC)"

include/sound/ymfpci.h

+2 −3
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ struct snd_ymfpci { 
	int irq;



	unsigned int device_id;	/* PCI device ID */

	unsigned int rev;	/* PCI revision */

	unsigned char rev;	/* PCI revision */

	unsigned long reg_area_phys;

	void __iomem *reg_area_virt;

	struct resource *res_reg_area;
@@ -345,7 +345,6 @@ struct snd_ymfpci { 
	struct snd_kcontrol *spdif_pcm_ctl;

	int mode_dup4ch;

	int rear_opened;

	int rear_swap;

	int spdif_opened;

	struct {

		u16 left;
@@ -378,7 +377,7 @@ int snd_ymfpci_pcm(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm); 
int snd_ymfpci_pcm2(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);

int snd_ymfpci_pcm_spdif(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);

int snd_ymfpci_pcm_4ch(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);

int snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch, int rear_swap);

int snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch);

int snd_ymfpci_timer(struct snd_ymfpci *chip, int device);



#endif /* __SOUND_YMFPCI_H */

sound/aoa/codecs/snd-aoa-codec-onyx.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#define __SND_AOA_CODEC_ONYX_H

#include <stddef.h>

#include <linux/i2c.h>

#include <linux/i2c-dev.h>

#include <asm/pmac_low_i2c.h>

#include <asm/prom.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE