diff options
| author | Tyler Trafford <devnull@localhost> | 2005-11-09 19:20:41 +0000 |
|---|---|---|
| committer | Tyler Trafford <devnull@localhost> | 2005-11-09 19:20:41 +0000 |
| commit | 2ed5859682c9325d47ec3d21617e8b7c861c1c7e (patch) | |
| tree | fd3ae2fedb6c93932cbe5d1b432a5ebd2b97f469 | |
| parent | 6033912ae56f94e6c37560a7eee9d84c1c2f2039 (diff) | |
| download | mediapointer-dvb-s2-2ed5859682c9325d47ec3d21617e8b7c861c1c7e.tar.gz mediapointer-dvb-s2-2ed5859682c9325d47ec3d21617e8b7c861c1c7e.tar.bz2 | |
make cx25840 use firmware image named 'cx25840.fw'
From: Tyler Trafford <tatrafford@comcast.net>
Change default filename of firmware image to 'cx25840.fw'
Signed-off-by: Tyler Trafford <tatrafford@comcast.net>
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-firmware.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-oss.c | 44 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
3 files changed, 31 insertions, 23 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-firmware.c b/linux/drivers/media/video/cx25840/cx25840-firmware.c index 6050649e4..2c0672978 100644 --- a/linux/drivers/media/video/cx25840/cx25840-firmware.c +++ b/linux/drivers/media/video/cx25840/cx25840-firmware.c @@ -25,7 +25,7 @@ #include "cx25840.h" -#define FWFILE "HcwMakoA.ROM" +#define FWFILE "cx25840.fw" #define FWSEND 1024 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c index b9d9d7406..70efe7d71 100644 --- a/linux/drivers/media/video/saa7134/saa7134-oss.c +++ b/linux/drivers/media/video/saa7134/saa7134-oss.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-oss.c,v 1.23 2005/11/09 18:30:51 mchehab Exp $ + * $Id: saa7134-oss.c,v 1.24 2005/11/09 19:20:41 trafford Exp $ * * device driver for philips saa7134 based TV cards * oss dsp interface @@ -793,11 +793,11 @@ static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs) status = saa_readl(SAA7134_IRQ_STATUS); if (report & SAA7134_IRQ_REPORT_DONE_RA3) { - handled = 1; - saa_writel(SAA7134_IRQ_REPORT,report); - saa7134_irq_oss_done(dev, status); + handled = 1; + saa_writel(SAA7134_IRQ_REPORT,report); + saa7134_irq_oss_done(dev, status); } else { - goto out; + goto out; } } @@ -812,7 +812,7 @@ int saa7134_oss_init1(struct saa7134_dev *dev) { if ((request_irq(dev->pci->irq, saa7134_oss_irq, - SA_SHIRQ | SA_INTERRUPT, dev->name, + SA_SHIRQ | SA_INTERRUPT, dev->name, (void*) &dev->dmasound)) < 0) return -1; @@ -904,22 +904,22 @@ int saa7134_dsp_create(struct saa7134_dev *dev) { int err; - err = dev->dmasound.minor_dsp = - register_sound_dsp(&saa7134_dsp_fops, - dsp_nr[dev->nr]); - if (err < 0) { - goto fail; - } - printk(KERN_INFO "%s: registered device dsp%d\n", - dev->name,dev->dmasound.minor_dsp >> 4); - - err = dev->dmasound.minor_mixer = - register_sound_mixer(&saa7134_mixer_fops, - mixer_nr[dev->nr]); - if (err < 0) - goto fail; - printk(KERN_INFO "%s: registered device mixer%d\n", - dev->name,dev->dmasound.minor_mixer >> 4); + err = dev->dmasound.minor_dsp = + register_sound_dsp(&saa7134_dsp_fops, + dsp_nr[dev->nr]); + if (err < 0) { + goto fail; + } + printk(KERN_INFO "%s: registered device dsp%d\n", + dev->name,dev->dmasound.minor_dsp >> 4); + + err = dev->dmasound.minor_mixer = + register_sound_mixer(&saa7134_mixer_fops, + mixer_nr[dev->nr]); + if (err < 0) + goto fail; + printk(KERN_INFO "%s: registered device mixer%d\n", + dev->name,dev->dmasound.minor_mixer >> 4); return 0; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 326e44400..6c5ebbf91 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-11-09 19:15 trafford + + * ../linux/driver/media/video/cx25840/cx25840-firmware.c: + + - Change default filename of firmware image to 'cx25840.fw' + + Signed-off-by: Tyler Trafford <tatrafford@comcast.net> + 2005-11-09 19:09 rmcc * ../linux/drivers/media/video/compat_ioctl32.c: |