Merge DVB updates

diff --cc drivers/media/dvb/frontends/tda1004x.c
Simple merge

diff --cc drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index b77bfd54794e8a9d93edee313320f93844780435,987034d7652f2d3f485916ac6953ff77562f6cf7..8b927e6f94b388c94e2afdb9e0fa01ec008e3f00
--- 1/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
--- 2/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@@ -1077,17 -1078,8 +1078,19 @@@ static int ttusb_probe(struct usb_inter
  
        udev = interface_to_usbdev(intf);
  
 +      /* Device has already been reset; its configuration was chosen.
 +       * If this fault happens, use a hotplug script to choose the
 +       * right configuration (write bConfigurationValue in sysfs).
 +       */
 +      if (udev->actconfig->desc.bConfigurationValue != 1) {
 +              dev_err(&intf->dev, "device config is #%d, need #1\n",
 +                      udev->actconfig->desc.bConfigurationValue);
 +              return -ENODEV;
 +      }
 +
 +
+         if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
+ 
        if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL)))
                return -ENOMEM;