From c39f7f2ec338cf07bb7bc4fea1be0f4da0e5cac2 Mon Sep 17 00:00:00 2001 From: Roel Kluin <12o3l@tiscali.nl> Date: Mon, 28 Apr 2008 02:15:10 -0700 Subject: [PATCH] --- yaml --- r: 94163 b: refs/heads/master c: af2afd247f0fae25d66f210fb800fe6a2958366e h: refs/heads/master i: 94161: 05647897a44d9936b5885b3f0fe4fc222d3b0177 94159: 30f22233f1c066be78b7f2a00be4b9019dbac62a v: v3 --- [refs] | 2 +- trunk/drivers/video/aty/aty128fb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9645d60afbe6..a4a9279f5b28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e3f0ca812ab8fa3f4e65ade41bf6fb936f14e15 +refs/heads/master: af2afd247f0fae25d66f210fb800fe6a2958366e diff --git a/trunk/drivers/video/aty/aty128fb.c b/trunk/drivers/video/aty/aty128fb.c index cbd3308b6690..27faffdee11b 100644 --- a/trunk/drivers/video/aty/aty128fb.c +++ b/trunk/drivers/video/aty/aty128fb.c @@ -1885,7 +1885,7 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i /* range check to make sure */ if (ent->driver_data < ARRAY_SIZE(r128_family)) - strncat(video_card, r128_family[ent->driver_data], sizeof(video_card)); + strlcat(video_card, r128_family[ent->driver_data], sizeof(video_card)); printk(KERN_INFO "aty128fb: %s [chip rev 0x%x] ", video_card, chip_rev);