diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 14:09:35 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 14:09:35 -0200 |
| commit | 3a6b5dfd2270a9ddcdf2b81e4dfa9388a343b0cd (patch) | |
| tree | fb366a5eeb327b59981f5119fd88341894f63330 /linux/sound | |
| parent | 538526dca5f2ca9e027d129c6d1931c2fe94829d (diff) | |
| download | mediapointer-dvb-s2-3a6b5dfd2270a9ddcdf2b81e4dfa9388a343b0cd.tar.gz mediapointer-dvb-s2-3a6b5dfd2270a9ddcdf2b81e4dfa9388a343b0cd.tar.bz2 | |
Backport some changes that happened at mainstream
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Basic changes:
- replaced i2c_bit_del_bus() to i2c_del_adapter();
- Fixed MODULE_AUTHOR on ov7670
- Updates on drivers not maintained on this tree: i2c-id.h and sound/*
kernel-sync:
drivers/media/dvb/pluto2/pluto2.c | 8 ++++----
drivers/media/video/bt8xx/bttv-i2c.c | 6 +-----
drivers/media/video/cx88/cx88-core.c | 2 +-
drivers/media/video/cx88/cx88-vp3054-i2c.c | 2 +-
drivers/media/video/ov7670.c | 2 +-
drivers/media/video/vino.c | 2 +-
drivers/media/video/zoran_card.c | 2 +-
include/linux/i2c-id.h | 18 ++++++------------
sound/pci/bt87x.c | 4 ++--
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound')
| -rw-r--r-- | linux/sound/pci/bt87x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index 760c40277..69888fdcb 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -733,7 +733,7 @@ static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *nam SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(chip->pci), 128 * 1024, - (255 * 4092 + 1023) & ~1023); + ALIGN(255 * 4092, 1024)); } static int __devinit snd_bt87x_create(struct snd_card *card, @@ -785,7 +785,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card, snd_bt87x_writel(chip, REG_INT_MASK, 0); snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS); - if (request_irq(pci->irq, snd_bt87x_interrupt, IRQF_DISABLED | IRQF_SHARED, + if (request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED, "Bt87x audio", chip)) { snd_bt87x_free(chip); snd_printk(KERN_ERR "cannot grab irq\n"); |