Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

17 files changed, 49 insertions, 27 deletions

diff --git a/drivers/media/usb/dvb-usb-v2/af9015.c b/drivers/media/usb/dvb-usb-v2/af9015.c
index 824f1911ee21..3d7526e28d42 100644
--- a/drivers/media/usb/dvb-usb-v2/af9015.c
+++ b/drivers/media/usb/dvb-usb-v2/af9015.c
@@ -500,7 +500,7 @@ static int af9015_read_config(struct dvb_usb_device *d)
                 case 3:
                         state->af9013_config[i].clock = 25000000;
                         break;
-                };
+                }
                 dev_dbg(&d->udev->dev, "%s: [%d] xtal=%d set clock=%d\n",
                                 __func__, i, val,
                                 state->af9013_config[i].clock);
@@ -568,7 +568,7 @@ static int af9015_read_config(struct dvb_usb_device *d)
                                         "supported, please report!\n",
                                         KBUILD_MODNAME, val);
                         return -ENODEV;
-                };
+                }
 
                 state->af9013_config[i].tuner = val;
                 dev_dbg(&d->udev->dev, "%s: [%d] tuner id=%d\n",
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index aabd3fc03ea7..ea27eaff4e34 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -520,7 +520,7 @@ static int af9035_read_config(struct dvb_usb_device *d)
                         dev_warn(&d->udev->dev, "%s: tuner id=%02x not " \
                                         "supported, please report!",
                                         KBUILD_MODNAME, tmp);
-                };
+                }
 
                 /* tuner IF frequency */
                 ret = af9035_rd_reg(d, EEPROM_1_IFFREQ_L + eeprom_shift, &tmp);
diff --git a/drivers/media/usb/dvb-usb/a800.c b/drivers/media/usb/dvb-usb/a800.c
index 8d7fef84afd8..83684ed023cd 100644
--- a/drivers/media/usb/dvb-usb/a800.c
+++ b/drivers/media/usb/dvb-usb/a800.c
@@ -93,7 +93,7 @@ static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         /* call the universal NEC remote processor, to find out the key's state and event */
         dvb_usb_nec_rc_key_to_event(d,key,event,state);
         if (key[0] != 0)
-                deb_rc("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
+                deb_rc("key: %*ph\n", 5, key);
         ret = 0;
 out:
         kfree(key);
diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
index 0a98548ecd17..9fd1527494eb 100644
--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
@@ -172,8 +172,7 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                 if (*event != d->last_event)
                         st->rc_counter = 0;
 
-                deb_rc("key: %x %x %x %x %x\n",
-                       key[0], key[1], key[2], key[3], key[4]);
+                deb_rc("key: %*ph\n", 5, key);
         }
         return 0;
 }
diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c
index a76bbb29ca36..af0d4321845b 100644
--- a/drivers/media/usb/dvb-usb/dibusb-common.c
+++ b/drivers/media/usb/dvb-usb/dibusb-common.c
@@ -473,7 +473,7 @@ int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         dvb_usb_generic_rw(d,&cmd,1,key,5,0);
         dvb_usb_nec_rc_key_to_event(d,key,event,state);
         if (key[0] != 0)
-                deb_info("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
+                deb_info("key: %*ph\n", 5, key);
         return 0;
 }
 EXPORT_SYMBOL(dibusb_rc_query);
diff --git a/drivers/media/usb/dvb-usb/digitv.c b/drivers/media/usb/dvb-usb/digitv.c
index ff34419a4c88..772bde3c5020 100644
--- a/drivers/media/usb/dvb-usb/digitv.c
+++ b/drivers/media/usb/dvb-usb/digitv.c
@@ -253,7 +253,7 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         }
 
         if (key[0] != 0)
-                deb_rc("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
+                deb_rc("key: %*ph\n", 5, key);
         return 0;
 }
 
diff --git a/drivers/media/usb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c
index 66f205c112b2..c357fb3b0a88 100644
--- a/drivers/media/usb/dvb-usb/dtt200u.c
+++ b/drivers/media/usb/dvb-usb/dtt200u.c
@@ -84,7 +84,7 @@ static int dtt200u_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         dvb_usb_generic_rw(d,&cmd,1,key,5,0);
         dvb_usb_nec_rc_key_to_event(d,key,event,state);
         if (key[0] != 0)
-                deb_info("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
+                deb_info("key: %*ph\n", 5, key);
         return 0;
 }
 
diff --git a/drivers/media/usb/dvb-usb/m920x.c b/drivers/media/usb/dvb-usb/m920x.c
index 288af29a8bb7..661bb75be955 100644
--- a/drivers/media/usb/dvb-usb/m920x.c
+++ b/drivers/media/usb/dvb-usb/m920x.c
@@ -358,7 +358,7 @@ static int m920x_firmware_download(struct usb_device *udev, const struct firmwar
 
         if ((ret = m920x_read(udev, M9206_FILTER, 0x0, 0x8000, read, 4)) != 0)
                 goto done;
-        deb("%x %x %x %x\n", read[0], read[1], read[2], read[3]);
+        deb("%*ph\n", 4, read);
 
         if ((ret = m920x_read(udev, M9206_FW, 0x0, 0x0, read, 1)) != 0)
                 goto done;
diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
index acefaa89cc53..7a8c8c18590f 100644
--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
@@ -677,6 +677,7 @@ static struct usb_device_id technisat_usb2_id_table[] = {
         { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_DVB_S2) },
         { 0 }           /* Terminating entry */
 };
+MODULE_DEVICE_TABLE(usb, technisat_usb2_id_table);
 
 /* device description */
 static struct dvb_usb_device_properties technisat_usb2_devices = {
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index f7297ae76b48..16a84f9f46d8 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2203,7 +2203,7 @@ EXPORT_SYMBOL_GPL(em28xx_tuner_callback);
 
 static inline void em28xx_set_model(struct em28xx *dev)
 {
-        memcpy(&dev->board, &em28xx_boards[dev->model], sizeof(dev->board));
+        dev->board = em28xx_boards[dev->model];
 
         /* Those are the default values for the majority of boards
            Use those values if not specified otherwise at boards entry
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 913e5227897a..13ae821949e9 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -574,18 +574,19 @@ static void pctv_520e_init(struct em28xx *dev)
                 i2c_master_send(&dev->i2c_client, regs[i].r, regs[i].len);
 };
 
-static int em28xx_pctv_290e_set_lna(struct dvb_frontend *fe, int val)
+static int em28xx_pctv_290e_set_lna(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct em28xx *dev = fe->dvb->priv;
 #ifdef CONFIG_GPIOLIB
         struct em28xx_dvb *dvb = dev->dvb;
         int ret;
         unsigned long flags;
 
-        if (val)
-                flags = GPIOF_OUT_INIT_LOW;
+        if (c->lna == 1)
+                flags = GPIOF_OUT_INIT_HIGH; /* enable LNA */
         else
-                flags = GPIOF_OUT_INIT_HIGH;
+                flags = GPIOF_OUT_INIT_LOW; /* disable LNA */
 
         ret = gpio_request_one(dvb->lna_gpio, flags, NULL);
         if (ret)
@@ -595,8 +596,8 @@ static int em28xx_pctv_290e_set_lna(struct dvb_frontend *fe, int val)
 
         return ret;
 #else
-        dev_warn(&dev->udev->dev, "%s: LNA control is disabled\n",
-                        KBUILD_MODNAME);
+        dev_warn(&dev->udev->dev, "%s: LNA control is disabled (lna=%u)\n",
+                        KBUILD_MODNAME, c->lna);
         return 0;
 #endif
 }
diff --git a/drivers/media/usb/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c
index b62740846061..34a26e0cfe77 100644
--- a/drivers/media/usb/stk1160/stk1160-core.c
+++ b/drivers/media/usb/stk1160/stk1160-core.c
@@ -100,12 +100,21 @@ int stk1160_write_reg(struct stk1160 *dev, u16 reg, u16 value)
 
 void stk1160_select_input(struct stk1160 *dev)
 {
+        int route;
         static const u8 gctrl[] = {
-                0x98, 0x90, 0x88, 0x80
+                0x98, 0x90, 0x88, 0x80, 0x98
         };
 
-        if (dev->ctl_input < ARRAY_SIZE(gctrl))
+        if (dev->ctl_input == STK1160_SVIDEO_INPUT)
+                route = SAA7115_SVIDEO3;
+        else
+                route = SAA7115_COMPOSITE0;
+
+        if (dev->ctl_input < ARRAY_SIZE(gctrl)) {
+                v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing,
+                                route, 0, 0);
                 stk1160_write_reg(dev, STK1160_GCTRL, gctrl[dev->ctl_input]);
+        }
 }
 
 /* TODO: We should break this into pieces */
@@ -351,8 +360,6 @@ static int stk1160_probe(struct usb_interface *interface,
 
         /* i2c reset saa711x */
         v4l2_device_call_all(&dev->v4l2_dev, 0, core, reset, 0);
-        v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing,
-                                0, 0, 0);
         v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);
 
         /* reset stk1160 to default values */
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index fe6e857969ca..6694f9e2ca57 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -419,7 +419,12 @@ static int vidioc_enum_input(struct file *file, void *priv,
         if (i->index > STK1160_MAX_INPUT)
                 return -EINVAL;
 
-        sprintf(i->name, "Composite%d", i->index);
+        /* S-Video special handling */
+        if (i->index == STK1160_SVIDEO_INPUT)
+                sprintf(i->name, "S-Video");
+        else
+                sprintf(i->name, "Composite%d", i->index);
+
         i->type = V4L2_INPUT_TYPE_CAMERA;
         i->std = dev->vdev.tvnorms;
         return 0;
diff --git a/drivers/media/usb/stk1160/stk1160.h b/drivers/media/usb/stk1160/stk1160.h
index 3feba0033f98..68c8707d36ab 100644
--- a/drivers/media/usb/stk1160/stk1160.h
+++ b/drivers/media/usb/stk1160/stk1160.h
@@ -46,7 +46,8 @@
 
 #define STK1160_MIN_PKT_SIZE 3072
 
-#define STK1160_MAX_INPUT 3
+#define STK1160_MAX_INPUT 4
+#define STK1160_SVIDEO_INPUT 4
 
 #define STK1160_I2C_TIMEOUT 100
 
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index 5577381b5bf0..18a91fae6bc1 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -122,21 +122,27 @@ static struct vb2_ops uvc_queue_qops = {
         .buf_finish = uvc_buffer_finish,
 };
 
-void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
+int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
                     int drop_corrupted)
 {
+        int ret;
+
         queue->queue.type = type;
         queue->queue.io_modes = VB2_MMAP | VB2_USERPTR;
         queue->queue.drv_priv = queue;
         queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
         queue->queue.ops = &uvc_queue_qops;
         queue->queue.mem_ops = &vb2_vmalloc_memops;
-        vb2_queue_init(&queue->queue);
+        ret = vb2_queue_init(&queue->queue);
+        if (ret)
+                return ret;
 
         mutex_init(&queue->mutex);
         spin_lock_init(&queue->irqlock);
         INIT_LIST_HEAD(&queue->irqqueue);
         queue->flags = drop_corrupted ? UVC_QUEUE_DROP_CORRUPTED : 0;
+
+        return 0;
 }
 
 /* -----------------------------------------------------------------------------
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 1c15b4227bdb..57c3076a4625 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -1755,7 +1755,9 @@ int uvc_video_init(struct uvc_streaming *stream)
         atomic_set(&stream->active, 0);
 
         /* Initialize the video buffers queue. */
-        uvc_queue_init(&stream->queue, stream->type, !uvc_no_drop_param);
+        ret = uvc_queue_init(&stream->queue, stream->type, !uvc_no_drop_param);
+        if (ret)
+                return ret;
 
         /* Alternate setting 0 should be the default, yet the XBox Live Vision
          * Cam (and possibly other devices) crash or otherwise misbehave if
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 3764040475bb..af216ec45e39 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -600,7 +600,7 @@ extern struct uvc_driver uvc_driver;
 extern struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id);
 
 /* Video buffers queue management. */
-extern void uvc_queue_init(struct uvc_video_queue *queue,
+extern int uvc_queue_init(struct uvc_video_queue *queue,
                 enum v4l2_buf_type type, int drop_corrupted);
 extern int uvc_alloc_buffers(struct uvc_video_queue *queue,
                 struct v4l2_requestbuffers *rb);