From 50ff341992ec860263018d3197853603818d5ea4 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Sun, 20 Apr 2008 11:27:36 -0300
Subject: [PATCH] --- yaml --- r: 92799 b: refs/heads/master c:
 d2b213f7b76f187c4391079c7581d3a08b940133 h: refs/heads/master i:   92797:
 714b05c1212a3916d3e5b551083bea10377464ce   92795:
 8569bb808164ee55ef89d6c857ec4c8eed0d309b   92791:
 7ed8f435b4e0467af8a6781b3b9100202b07f67c   92783:
 13dc86b86cd6db3612585a32aa05cb6d02babb52   92767:
 3f2a3a77d622b0a74359720d8b20d84769561614   92735:
 d9180378b29b88dc370019189d0b8289e5f167fa   92671:
 9942408bff2b7af799a99ce8a1024154ddd419bd v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 89e422afe57e..e23e54b01efc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 867e835f4db4eba6d49072382cc05fc210c4ed1c
+refs/heads/master: d2b213f7b76f187c4391079c7581d3a08b940133
diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
index 90f59c4155ae..15cac1812122 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -742,7 +742,8 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 
 		memset(vcap, 0, sizeof(*vcap));
 		strcpy(vcap->driver, IVTV_DRIVER_NAME);     /* driver name */
-		strcpy(vcap->card, itv->card_name); 	    /* card type */
+		strncpy(vcap->card, itv->card_name,
+				sizeof(vcap->card)-1); 	    /* card type */
 		strcpy(vcap->bus_info, pci_name(itv->dev)); /* bus info... */
 		vcap->version = IVTV_DRIVER_VERSION; 	    /* version */
 		vcap->capabilities = itv->v4l2_cap; 	    /* capabilities */