projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
[powerpc.git]
/
drivers
/
char
/
agp
/
amd-k7-agp.c
diff --git
a/drivers/char/agp/amd-k7-agp.c
b/drivers/char/agp/amd-k7-agp.c
index
51d0d56
..
e6c534e
100644
(file)
--- a/
drivers/char/agp/amd-k7-agp.c
+++ b/
drivers/char/agp/amd-k7-agp.c
@@
-101,6
+101,11
@@
static int amd_create_gatt_pages(int nr_tables)
for (i = 0; i < nr_tables; i++) {
entry = kzalloc(sizeof(struct amd_page_map), GFP_KERNEL);
if (entry == NULL) {
for (i = 0; i < nr_tables; i++) {
entry = kzalloc(sizeof(struct amd_page_map), GFP_KERNEL);
if (entry == NULL) {
+ while (i > 0) {
+ kfree(tables[i-1]);
+ i--;
+ }
+ kfree(tables);
retval = -ENOMEM;
break;
}
retval = -ENOMEM;
break;
}
@@
-339,7
+344,7
@@
static int amd_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
return 0;
}
return 0;
}
-static struct aper_size_info_lvl2 amd_irongate_sizes[7] =
+static
const
struct aper_size_info_lvl2 amd_irongate_sizes[7] =
{
{2048, 524288, 0x0000000c},
{1024, 262144, 0x0000000a},
{
{2048, 524288, 0x0000000c},
{1024, 262144, 0x0000000a},
@@
-350,12
+355,12
@@
static struct aper_size_info_lvl2 amd_irongate_sizes[7] =
{32, 8192, 0x00000000}
};
{32, 8192, 0x00000000}
};
-static struct gatt_mask amd_irongate_masks[] =
+static
const
struct gatt_mask amd_irongate_masks[] =
{
{.mask = 1, .type = 0}
};
{
{.mask = 1, .type = 0}
};
-static struct agp_bridge_driver amd_irongate_driver = {
+static
const
struct agp_bridge_driver amd_irongate_driver = {
.owner = THIS_MODULE,
.aperture_sizes = amd_irongate_sizes,
.size_type = LVL2_APER_SIZE,
.owner = THIS_MODULE,
.aperture_sizes = amd_irongate_sizes,
.size_type = LVL2_APER_SIZE,
@@
-376,6
+381,7
@@
static struct agp_bridge_driver amd_irongate_driver = {
.free_by_type = agp_generic_free_by_type,
.agp_alloc_page = agp_generic_alloc_page,
.agp_destroy_page = agp_generic_destroy_page,
.free_by_type = agp_generic_free_by_type,
.agp_alloc_page = agp_generic_alloc_page,
.agp_destroy_page = agp_generic_destroy_page,
+ .agp_type_to_mask_type = agp_generic_type_to_mask_type,
};
static struct agp_device_ids amd_agp_device_ids[] __devinitdata =
};
static struct agp_device_ids amd_agp_device_ids[] __devinitdata =