diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-alsa.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index 263c6e2e3e8e..b24a26b065c2 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
| @@ -51,6 +51,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]"); | |||
| 51 | #define MIXER_ADDR_LINE2 2 | 51 | #define MIXER_ADDR_LINE2 2 |
| 52 | #define MIXER_ADDR_LAST 2 | 52 | #define MIXER_ADDR_LAST 2 |
| 53 | 53 | ||
| 54 | |||
| 54 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ | 55 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ |
| 55 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ | 56 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ |
| 56 | static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0}; | 57 | static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0}; |
| @@ -59,11 +60,14 @@ module_param_array(index, int, NULL, 0444); | |||
| 59 | MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); | 60 | MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); |
| 60 | 61 | ||
| 61 | #define dprintk(fmt, arg...) if (debug) \ | 62 | #define dprintk(fmt, arg...) if (debug) \ |
| 62 | printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg) | 63 | printk(KERN_DEBUG "%s/alsa: " fmt, dev->name, ## arg) |
| 64 | |||
| 65 | |||
| 63 | 66 | ||
| 64 | /* | 67 | /* |
| 65 | * Main chip structure | 68 | * Main chip structure |
| 66 | */ | 69 | */ |
| 70 | |||
| 67 | typedef struct snd_card_saa7134 { | 71 | typedef struct snd_card_saa7134 { |
| 68 | snd_card_t *card; | 72 | snd_card_t *card; |
| 69 | spinlock_t mixer_lock; | 73 | spinlock_t mixer_lock; |
| @@ -208,8 +212,8 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev, | |||
| 208 | 212 | ||
| 209 | static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs) | 213 | static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs) |
| 210 | { | 214 | { |
| 211 | struct saa7134_dmasound *dmasound = dev_id; | 215 | struct saa7134_dmasound *dmasound = dev_id; |
| 212 | struct saa7134_dev *dev = dmasound->priv_data; | 216 | struct saa7134_dev *dev = dmasound->priv_data; |
| 213 | 217 | ||
| 214 | unsigned long report, status; | 218 | unsigned long report, status; |
| 215 | int loop, handled = 0; | 219 | int loop, handled = 0; |
| @@ -985,7 +989,7 @@ static int saa7134_alsa_init(void) | |||
| 985 | struct saa7134_dev *dev = NULL; | 989 | struct saa7134_dev *dev = NULL; |
| 986 | struct list_head *list; | 990 | struct list_head *list; |
| 987 | 991 | ||
| 988 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); | 992 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); |
| 989 | 993 | ||
| 990 | list_for_each(list,&saa7134_devlist) { | 994 | list_for_each(list,&saa7134_devlist) { |
| 991 | dev = list_entry(list, struct saa7134_dev, devlist); | 995 | dev = list_entry(list, struct saa7134_dev, devlist); |
| @@ -1004,6 +1008,7 @@ static int saa7134_alsa_init(void) | |||
| 1004 | printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n"); | 1008 | printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n"); |
| 1005 | 1009 | ||
| 1006 | return 0; | 1010 | return 0; |
| 1011 | |||
| 1007 | } | 1012 | } |
| 1008 | 1013 | ||
| 1009 | /* | 1014 | /* |
| @@ -1027,3 +1032,6 @@ module_init(saa7134_alsa_init); | |||
| 1027 | module_exit(saa7134_alsa_exit); | 1032 | module_exit(saa7134_alsa_exit); |
| 1028 | MODULE_LICENSE("GPL"); | 1033 | MODULE_LICENSE("GPL"); |
| 1029 | MODULE_AUTHOR("Ricardo Cerqueira"); | 1034 | MODULE_AUTHOR("Ricardo Cerqueira"); |
| 1035 | |||
| 1036 | |||
| 1037 | |||
