From 46daf0145367e18f0f8d3ef4dfc4b6df208af4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= Date: Wed, 18 Jul 2012 13:41:11 -0300 Subject: [PATCH] --- yaml --- r: 320695 b: refs/heads/master c: c854d8883fec59332f0662917f8c94dcfb1c405d h: refs/heads/master i: 320693: 8df948dd1f0cc3b96d44f63e477770d10c97bab3 320691: 39dca6d86cc4bccb4549ce8fb5a08f16592f4cbc 320687: 8f2d5e9123a09815593db966ba7de5353c711b40 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25821/cx25821-core.c | 3 --- trunk/drivers/media/video/cx25821/cx25821.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ca15ed6193a6..92cbf230c575 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eabdc68fffddb722f3653b1bee9bf1bb24207fec +refs/heads/master: c854d8883fec59332f0662917f8c94dcfb1c405d diff --git a/trunk/drivers/media/video/cx25821/cx25821-core.c b/trunk/drivers/media/video/cx25821/cx25821-core.c index 83c1aa6b2e6c..f11f6f07e915 100644 --- a/trunk/drivers/media/video/cx25821/cx25821-core.c +++ b/trunk/drivers/media/video/cx25821/cx25821-core.c @@ -904,9 +904,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev) list_add_tail(&dev->devlist, &cx25821_devlist); mutex_unlock(&cx25821_devlist_mutex); - strcpy(cx25821_boards[UNKNOWN_BOARD].name, "unknown"); - strcpy(cx25821_boards[CX25821_BOARD].name, "cx25821"); - if (dev->pci->device != 0x8210) { pr_info("%s(): Exiting. Incorrect Hardware device = 0x%02x\n", __func__, dev->pci->device); diff --git a/trunk/drivers/media/video/cx25821/cx25821.h b/trunk/drivers/media/video/cx25821/cx25821.h index ed525016f165..8a9c0c869412 100644 --- a/trunk/drivers/media/video/cx25821/cx25821.h +++ b/trunk/drivers/media/video/cx25821/cx25821.h @@ -186,7 +186,7 @@ enum port { }; struct cx25821_board { - char *name; + const char *name; enum port porta; enum port portb; enum port portc;