hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fbdev fixes for 3.19 

* broadsheetfb: fix memory leak
 * simplefb: fix build failure on sparc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUt6JeAAoJEPo9qoy8lh71u2sQAI5/erMGJ4U3sxQ09B/ewQra
 dVgNmPVv417GViUIaJgEGx6g9gqqZcx0iu+tmGrKgSPYf5s/ldHgIWx29drUm7pO
 NnUzxK1uj7+XrjCXVESNytHAH/yNgGQv8N3V9KtM+APzm0yUS5FCvCi72JAQ2Mwh
 dqroNbv22rGqrrdgBaAgDb8+AvkgliONKHZi0EZ6xOxfGVkwLBaolOfPWdknGpW6
 BIk6q0Fl6V0Wt4s7w2IgM3G6s2FIi/o5nuNaUtjzttJO6sBh+muILJUWJ1AtIEaN
 rTfFZeRbtl2jr81Ne7rCTL+wc+GPkEWiSA1jmmZrL74SIrZNowVktEIvvegDBk97
 t+CnF7bvkfbbJWzgNavzGbWvv4hF6pbqRvJhKW2ASIKPxYKUP55roXVHfdbV83e1
 MfM8aHOAaHdZyR/xdhhAFkhCaAfjt9yh500SQUkrRPXqWHFWAj4fMme4Oijnl+XC
 QA473/ApBVlH4TxA8GXRJLz6h+qZRY6vDIC4jHg0uu5XrS5VVv+zBw09fPf4TnVV
 uEajRcXD9AwwV64IFYInG8iATyZalwDHjvHm8e8OkTGgJLbZ6hGi5bGX7JBnLg8Q
 My5GC5vaX+xemwGxVYJoLtt/fvsESgd71ZaB3Q2henGZm17kyHuACR6m9/mTwQ1D
 84JW6EAk5MuDKa+Sqfjv
 =cau9
 -----END PGP SIGNATURE-----

Merge tag 'fbdev-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

Pull fbdev fixes from Tomi Valkeinen:
 - broadsheetfb: fix memory leak
 - simplefb: fix build failure on sparc

* tag 'fbdev-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  fbdev/broadsheetfb: fix memory leak
  simplefb: Fix build failure on Sparc
This commit is contained in:
Linus Torvalds 2015-01-16 14:55:47 +13:00
parent 7b552bc12f ef6899cdc8
commit 0b6212e0a4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/video/fbdev/broadsheetfb.c
View File

@ -636,7 +636,7 @@ static int broadsheet_spiflash_rewrite_sector(struct broadsheetfb_par *par,
err = broadsheet_spiflash_read_range(par, start_sector_addr, err = broadsheet_spiflash_read_range(par, start_sector_addr,
data_start_addr, sector_buffer); data_start_addr, sector_buffer);
if (err) if (err)
return err; goto out;
} }
/* now we copy our data into the right place in the sector buffer */ /* now we copy our data into the right place in the sector buffer */
@ -657,7 +657,7 @@ static int broadsheet_spiflash_rewrite_sector(struct broadsheetfb_par *par,
err = broadsheet_spiflash_read_range(par, tail_start_addr, err = broadsheet_spiflash_read_range(par, tail_start_addr,
tail_len, sector_buffer + tail_start_addr); tail_len, sector_buffer + tail_start_addr);
if (err) if (err)
return err; goto out;
} }
/* if we got here we have the full sector that we want to rewrite. */ /* if we got here we have the full sector that we want to rewrite. */
@ -665,11 +665,13 @@ static int broadsheet_spiflash_rewrite_sector(struct broadsheetfb_par *par,
/* first erase the sector */ /* first erase the sector */
err = broadsheet_spiflash_erase_sector(par, start_sector_addr); err = broadsheet_spiflash_erase_sector(par, start_sector_addr);
if (err) if (err)
return err; goto out;
/* now write it */ /* now write it */
err = broadsheet_spiflash_write_sector(par, start_sector_addr, err = broadsheet_spiflash_write_sector(par, start_sector_addr,
sector_buffer, sector_size); sector_buffer, sector_size);
out:
kfree(sector_buffer);
return err; return err;
} }

2
drivers/video/fbdev/simplefb.c
View File

@ -402,7 +402,7 @@ static int __init simplefb_init(void)
if (ret) if (ret)
return ret; return ret;
if (IS_ENABLED(CONFIG_OF) && of_chosen) { if (IS_ENABLED(CONFIG_OF_ADDRESS) && of_chosen) {
for_each_child_of_node(of_chosen, np) { for_each_child_of_node(of_chosen, np) {
if (of_device_is_compatible(np, "simple-framebuffer")) if (of_device_is_compatible(np, "simple-framebuffer"))
of_platform_device_create(np, NULL, NULL); of_platform_device_create(np, NULL, NULL);