diff options
Diffstat (limited to 'linux/drivers/media')
-rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/video/msp3400.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-i2c.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 14 | ||||
-rw-r--r-- | linux/drivers/media/video/video-buf-dvb.c | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 481ecbe65..3abb2a739 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -757,9 +757,9 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) if (current->flags & PF_FREEZE) { #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12) refrigerator (PF_FREEZE); -#else +#else refrigerator (); -#endif +#endif } remove_wait_queue(&msp->wq, &wait); diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index 481ecbe65..3abb2a739 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -757,9 +757,9 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) if (current->flags & PF_FREEZE) { #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12) refrigerator (PF_FREEZE); -#else +#else refrigerator (); -#endif +#endif } remove_wait_queue(&msp->wq, &wait); diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index a6a5d90e7..40564214d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.79 2005/07/05 17:37:35 nsh Exp $ + * $Id: saa7134-cards.c,v 1.80 2005/07/07 01:49:30 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2536,7 +2536,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) saa7134_i2c_call_clients (dev, TUNER_SET_TYPE_ADDR, &tun_setup); } break; - case SAA7134_BOARD_MD7134: + case SAA7134_BOARD_MD7134: { struct tuner_setup tun_setup; u8 subaddr; diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c index 3a71fa42a..ccfefaab7 100644 --- a/linux/drivers/media/video/saa7134/saa7134-i2c.c +++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-i2c.c,v 1.18 2005/07/05 17:37:35 nsh Exp $ + * $Id: saa7134-i2c.c,v 1.19 2005/07/07 01:49:30 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * i2c interface support @@ -343,7 +343,7 @@ static int attach_inform(struct i2c_client *client) return 0; if (saa7134_boards[dev->board].radio_type != UNSET) { - + tun_setup.type = saa7134_boards[dev->board].radio_type; tun_setup.addr = saa7134_boards[dev->board].radio_addr; diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index ee10dbad1..316483e5f 100644 --- a/linux/drivers/media/video/tuner-simple.c +++ b/linux/drivers/media/video/tuner-simple.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-simple.c,v 1.38 2005/07/06 21:46:25 nsh Exp $ + * $Id: tuner-simple.c,v 1.39 2005/07/07 01:49:30 mkrufky Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -57,9 +57,9 @@ /* Control byte */ -#define TUNER_RATIO_MASK 0x06 /* Bit cb1:cb2 */ -#define TUNER_RATIO_SELECT_50 0x00 -#define TUNER_RATIO_SELECT_32 0x02 +#define TUNER_RATIO_MASK 0x06 /* Bit cb1:cb2 */ +#define TUNER_RATIO_SELECT_50 0x00 +#define TUNER_RATIO_SELECT_32 0x02 #define TUNER_RATIO_SELECT_166 0x04 #define TUNER_RATIO_SELECT_62 0x06 @@ -71,11 +71,11 @@ #define TUNER_FL 0x40 #define TUNER_MODE 0x38 #define TUNER_AFC 0x07 -#define TUNER_SIGNAL 0x07 -#define TUNER_STEREO 0x10 +#define TUNER_SIGNAL 0x07 +#define TUNER_STEREO 0x10 #define TUNER_PLL_LOCKED 0x40 -#define TUNER_STEREO_MK3 0x04 +#define TUNER_STEREO_MK3 0x04 /* ---------------------------------------------------------------------- */ diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c index 1474700d5..61e6b62b7 100644 --- a/linux/drivers/media/video/video-buf-dvb.c +++ b/linux/drivers/media/video/video-buf-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: video-buf-dvb.c,v 1.10 2005/07/06 16:21:25 nsh Exp $ + * $Id: video-buf-dvb.c,v 1.11 2005/07/07 01:49:30 mkrufky Exp $ * * some helper function for simple DVB cards which simply DMA the * complete transport stream and let the computer sort everything else @@ -65,9 +65,9 @@ static int videobuf_dvb_thread(void *data) if (current->flags & PF_FREEZE) { #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12) refrigerator (PF_FREEZE); -#else +#else refrigerator (); -#endif +#endif } /* feed buffer data to demux */ |