Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 380e99fc authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Linus Torvalds
Browse files

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: default avatarRadek Masin <radek@masin.eu>
Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
[ Taking directly due to vacations   - Linus ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8a7298b7

drivers/media/video/cx25821/cx25821-core.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -904,9 +904,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev) 
	list_add_tail(&dev->devlist, &cx25821_devlist);

	list_add_tail(&dev->devlist, &cx25821_devlist);

	mutex_unlock(&cx25821_devlist_mutex);

	mutex_unlock(&cx25821_devlist_mutex);





	strcpy(cx25821_boards[UNKNOWN_BOARD].name, "unknown");

	strcpy(cx25821_boards[CX25821_BOARD].name, "cx25821");



	if (dev->pci->device != 0x8210) {

	if (dev->pci->device != 0x8210) {

		pr_info("%s(): Exiting. Incorrect Hardware device = 0x%02x\n",

		pr_info("%s(): Exiting. Incorrect Hardware device = 0x%02x\n",

			__func__, dev->pci->device);

			__func__, dev->pci->device);

drivers/media/video/cx25821/cx25821.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ enum port { 
};

};





struct cx25821_board {

struct cx25821_board {

	char *name;

	const char *name;

	enum port porta;

	enum port porta;

	enum port portb;

	enum port portb;

	enum port portc;

	enum port portc;