diff options
author | Magnus Damm <magnus@valinux.co.jp> | 2006-07-10 07:44:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 16:24:15 -0400 |
commit | 73ca66b97b73257a7d832d502c36fc19fe847809 (patch) | |
tree | d39f50b1931d67c51e56f891b785be1143599177 /drivers/media/video | |
parent | 454d6fbc48374be8f53b9bafaa86530cf8eb3bc1 (diff) |
[PATCH] release_firmware() fixes
Use release_firmware() to free requested resources.
According to Documentation/firmware_class/README the request_firmware()
call should be followed by a release_firmware(). Some drivers do not
however free the firmware previously allocated with request_firmware().
This patch tries to fix this by making sure that release_firmware() is used
as expected.
Signed-off-by: Magnus Damm <magnus@valinux.co.jp>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 349632b48e93..b60177f173c3 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -453,11 +453,13 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) | |||
453 | if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) { | 453 | if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) { |
454 | dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n", | 454 | dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n", |
455 | firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE); | 455 | firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE); |
456 | release_firmware(firmware); | ||
456 | return -1; | 457 | return -1; |
457 | } | 458 | } |
458 | 459 | ||
459 | if (0 != memcmp(firmware->data, magic, 8)) { | 460 | if (0 != memcmp(firmware->data, magic, 8)) { |
460 | dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n"); | 461 | dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n"); |
462 | release_firmware(firmware); | ||
461 | return -1; | 463 | return -1; |
462 | } | 464 | } |
463 | 465 | ||
@@ -478,6 +480,7 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) | |||
478 | } | 480 | } |
479 | if (checksum) { | 481 | if (checksum) { |
480 | dprintk(0, "ERROR: Firmware load failed (checksum mismatch).\n"); | 482 | dprintk(0, "ERROR: Firmware load failed (checksum mismatch).\n"); |
483 | release_firmware(firmware); | ||
481 | return -1; | 484 | return -1; |
482 | } | 485 | } |
483 | release_firmware(firmware); | 486 | release_firmware(firmware); |