diff options
| author | Ezequiel Garcia <elezegarcia@gmail.com> | 2012-07-18 10:05:26 -0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-19 08:15:33 -0700 |
| commit | 380e99fc44d79bc35af9ff1d3316ef4027ce775e (patch) | |
| tree | 03922c905bd8fbbc7c2c9bf592e4ad89813a77e6 | |
| parent | 8a7298b7805ab55dea674a8aba97cf2eac20dca8 (diff) | |
| download | kernel_goldelico_gta04-380e99fc44d79bc35af9ff1d3316ef4027ce775e.zip kernel_goldelico_gta04-380e99fc44d79bc35af9ff1d3316ef4027ce775e.tar.gz kernel_goldelico_gta04-380e99fc44d79bc35af9ff1d3316ef4027ce775e.tar.bz2 | |
cx25821: Remove bad strcpy to read-only char*
The strcpy was being used to set the name of the board. Since the
destination char* was read-only and the name is set statically at
compile time; this was both wrong and redundant.
The type of char* is changed to const char* to prevent future errors.
Reported-by: Radek Masin <radek@masin.eu>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
[ Taking directly due to vacations - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/media/video/cx25821/cx25821-core.c | 3 | ||||
| -rw-r--r-- | drivers/media/video/cx25821/cx25821.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c index 83c1aa6..f11f6f0 100644 --- a/drivers/media/video/cx25821/cx25821-core.c +++ b/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/drivers/media/video/cx25821/cx25821.h b/drivers/media/video/cx25821/cx25821.h index b9aa801..029f293 100644 --- a/drivers/media/video/cx25821/cx25821.h +++ b/drivers/media/video/cx25821/cx25821.h @@ -187,7 +187,7 @@ enum port { }; struct cx25821_board { - char *name; + const char *name; enum port porta; enum port portb; enum port portc; |