Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (583 commits)
  V4L/DVB (10130): use USB API functions rather than constants
  V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends
  V4L/DVB (10128): modify V4L documentation to be a valid XHTML
  V4L/DVB (10127): stv06xx: Avoid having y unitialized
  V4L/DVB (10125): em28xx: Don't do AC97 vendor detection for i2s audio devices
  V4L/DVB (10124): em28xx: expand output formats available
  V4L/DVB (10123): em28xx: fix reversed definitions of I2S audio modes
  V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices
  V4L/DVB (10121): em28xx: remove worthless Pinnacle PCTV HD Mini 80e device profile
  V4L/DVB (10120): em28xx: remove redundant Pinnacle Dazzle DVC 100 profile
  V4L/DVB (10119): em28xx: fix corrupted XCLK value
  V4L/DVB (10118): zoran: fix warning for a variable not used
  V4L/DVB (10116): af9013: Fix gcc false warnings
  V4L/DVB (10111a): usbvideo.h: remove an useless blank line
  V4L/DVB (10111): quickcam_messenger.c: fix a warning
  V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2
  V4L/DVB (10109): anysee: Fix usage of an unitialized function
  V4L/DVB (10104): uvcvideo: Add support for video output devices
  V4L/DVB (10102): uvcvideo: Ignore interrupt endpoint for built-in iSight webcams.
  V4L/DVB (10101): uvcvideo: Fix bulk URB processing when the header is erroneous
  ...

1 files changed, 11 insertions, 11 deletions

diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index c13a178383ba..549b4eba1496 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -18,7 +18,7 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- */      
+ */
 
 #include <asm/io.h>
 #include <linux/delay.h>
@@ -89,7 +89,7 @@ static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
 {
         struct snd_tea575x *tea = video_drvdata(file);
         void __user *arg = (void __user *)data;
-        
+
         switch(cmd) {
                 case VIDIOCGCAP:
                 {
@@ -110,9 +110,9 @@ static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
                 case VIDIOCGTUNER:
                 {
                         struct video_tuner v;
-                        if (copy_from_user(&v, arg,sizeof(v))!=0) 
+                        if (copy_from_user(&v, arg,sizeof(v))!=0)
                                 return -EFAULT;
-                        if (v.tuner)    /* Only 1 tuner */ 
+                        if (v.tuner)    /* Only 1 tuner */
                                 return -EINVAL;
                         v.rangelow = (87*16000);
                         v.rangehigh = (108*16000);
@@ -144,24 +144,24 @@ static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
                         snd_tea575x_set_freq(tea);
                         return 0;
                 case VIDIOCGAUDIO:
-                {       
+                {
                         struct video_audio v;
                         memset(&v, 0, sizeof(v));
                         strcpy(v.name, "Radio");
                         if(copy_to_user(arg,&v, sizeof(v)))
                                 return -EFAULT;
-                        return 0;                       
+                        return 0;
                 }
                 case VIDIOCSAUDIO:
                 {
                         struct video_audio v;
-                        if(copy_from_user(&v, arg, sizeof(v))) 
-                                return -EFAULT; 
+                        if(copy_from_user(&v, arg, sizeof(v)))
+                                return -EFAULT;
                         if (tea->ops->mute)
                                 tea->ops->mute(tea,
                                                (v.flags &
                                                 VIDEO_AUDIO_MUTE) ? 1 : 0);
-                        if(v.audio) 
+                        if(v.audio)
                                 return -EINVAL;
                         return 0;
                 }
@@ -240,11 +240,11 @@ static int __init alsa_tea575x_module_init(void)
 {
         return 0;
 }
-        
+
 static void __exit alsa_tea575x_module_exit(void)
 {
 }
-        
+
 module_init(alsa_tea575x_module_init)
 module_exit(alsa_tea575x_module_exit)