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: (313 commits)
  V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
  V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
  V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
  V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
  V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
  V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
  V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
  V4L/DVB (9179): S2API: frontend.h cleanup
  V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
  V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
  V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
  V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
  V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
  V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
  V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
  V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
  V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
  V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
  V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
  V4L/DVB: v4l2-dev: remove duplicated #include
  ...

1 files changed, 18 insertions, 10 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 70c65a745923..66783fffe4c1 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -274,7 +274,7 @@ static int vidioc_querycap(struct file *file, void *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -306,7 +306,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         radio->curfreq = f->frequency;
         if (dsbr100_setfreq(radio, radio->curfreq)==-1)
@@ -317,7 +317,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = radio->curfreq;
@@ -342,7 +342,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -355,16 +355,20 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
                 if (ctrl->value) {
-                        if (dsbr100_stop(radio)==-1)
+                        if (dsbr100_stop(radio) == -1) {
                                 warn("Radio did not respond properly");
+                                return -EBUSY;
+                        }
                 } else {
-                        if (dsbr100_start(radio)==-1)
+                        if (dsbr100_start(radio) == -1) {
                                 warn("Radio did not respond properly");
+                                return -EBUSY;
+                        }
                 }
                 return 0;
         }
@@ -405,23 +409,26 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static int usb_dsbr100_open(struct inode *inode, struct file *file)
 {
-        struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
+        lock_kernel();
         radio->users = 1;
         radio->muted = 1;
 
         if (dsbr100_start(radio)<0) {
                 warn("Radio did not start up properly");
                 radio->users = 0;
+                unlock_kernel();
                 return -EIO;
         }
         dsbr100_setfreq(radio, radio->curfreq);
+        unlock_kernel();
         return 0;
 }
 
 static int usb_dsbr100_close(struct inode *inode, struct file *file)
 {
-        struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         if (!radio)
                 return -ENODEV;
@@ -507,7 +514,8 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
 static int __init dsbr100_init(void)
 {
         int retval = usb_register(&usb_dsbr100_driver);
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return retval;
 }