[PATCH v2 4/7] agp/ati: Return error from ati_create_page_map()

From: Thomas Zimmermann
Date: Wed Dec 01 2021 - 06:47:03 EST


Fix the compiler warning

drivers/char/agp/ati-agp.c: In function 'ati_create_page_map':
drivers/char/agp/ati-agp.c:58:16: warning: variable 'err' set but not used [-Wunused-but-set-variable]
58 | int i, err = 0;

by returing the error to the caller.

v2:
* free page in error branch (Helge)

Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
---
drivers/char/agp/ati-agp.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 857b37141a07..6f5530482d83 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -55,7 +55,7 @@ static struct _ati_generic_private {

static int ati_create_page_map(struct ati_page_map *page_map)
{
- int i, err = 0;
+ int i, err;

page_map->real = (unsigned long *) __get_free_page(GFP_KERNEL);
if (page_map->real == NULL)
@@ -63,6 +63,10 @@ static int ati_create_page_map(struct ati_page_map *page_map)

set_memory_uc((unsigned long)page_map->real, 1);
err = map_page_into_agp(virt_to_page(page_map->real));
+ if (err) {
+ free_page((unsigned long)page_map->real);
+ return err;
+ }
page_map->remapped = page_map->real;

for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
--
2.34.0