mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Innocuous fixes:
* fix to Kconfig to make it fit within 80 line characters, * two bootup fixes (AMD 8-core and with PCI BIOS), * cleanup code in a Xen PV fb driver, * and a crash fix when trying to see non-existent PTE's -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJPp/iaAAoJEFjIrFwIi8fJAFsH/1NVxvOAHyzyczU49U/1vi8T d67kIb8fFHni6HO7BiBkuM8DricGQnDhP7uC1n9waWf8jRiYsPTAbesyedTLbQos SLfzpsLWKilJOxWCf17cBnm6i9ScQn1ioJ6h3jFzHgNCXnvvAVYqfKHW0V6HTErH JL0eb4+asiZgXNSeac1gabQlai6LuBzMWaFgzRGY+hDnCQhkdQfDkD7X5zEhUUmH jUmtSxRx+5LkfelwRb2kHhI5j58ilOEa7YLZFQc3C+2+bUvgsG9vJDsQ3jwFaGDn cryfRY9WJXxgcXqk1ClOnk9U9PGzRc48gdLVLhYuLsIvUWN7RzgRlBMsH33Gq9M= =kjvX -----END PGP SIGNATURE----- Merge tag 'stable/for-linus-3.4-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen Pull xen fixes from Konrad Rzeszutek Wilk: - fix to Kconfig to make it fit within 80 line characters, - two bootup fixes (AMD 8-core and with PCI BIOS), - cleanup code in a Xen PV fb driver, - and a crash fix when trying to see non-existent PTE's * tag 'stable/for-linus-3.4-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/Kconfig: fix Kconfig layout xen/pci: don't use PCI BIOS service for configuration space accesses xen/pte: Fix crashes when trying to see non-existent PGD/PMD/PUD/PTEs xen/apic: Return the APIC ID (and version) for CPU 0. drivers/video/xen-fbfront.c: add missing cleanup code
This commit is contained in:
commit
4ed6cedeef
4 changed files with 73 additions and 25 deletions
|
|
@ -365,7 +365,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
|
|||
struct fb_info *fb_info;
|
||||
int fb_size;
|
||||
int val;
|
||||
int ret;
|
||||
int ret = 0;
|
||||
|
||||
info = kzalloc(sizeof(*info), GFP_KERNEL);
|
||||
if (info == NULL) {
|
||||
|
|
@ -458,26 +458,31 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
|
|||
xenfb_init_shared_page(info, fb_info);
|
||||
|
||||
ret = xenfb_connect_backend(dev, info);
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
if (ret < 0) {
|
||||
xenbus_dev_fatal(dev, ret, "xenfb_connect_backend");
|
||||
goto error_fb;
|
||||
}
|
||||
|
||||
ret = register_framebuffer(fb_info);
|
||||
if (ret) {
|
||||
fb_deferred_io_cleanup(fb_info);
|
||||
fb_dealloc_cmap(&fb_info->cmap);
|
||||
framebuffer_release(fb_info);
|
||||
xenbus_dev_fatal(dev, ret, "register_framebuffer");
|
||||
goto error;
|
||||
goto error_fb;
|
||||
}
|
||||
info->fb_info = fb_info;
|
||||
|
||||
xenfb_make_preferred_console();
|
||||
return 0;
|
||||
|
||||
error_nomem:
|
||||
ret = -ENOMEM;
|
||||
xenbus_dev_fatal(dev, ret, "allocating device memory");
|
||||
error:
|
||||
error_fb:
|
||||
fb_deferred_io_cleanup(fb_info);
|
||||
fb_dealloc_cmap(&fb_info->cmap);
|
||||
framebuffer_release(fb_info);
|
||||
error_nomem:
|
||||
if (!ret) {
|
||||
ret = -ENOMEM;
|
||||
xenbus_dev_fatal(dev, ret, "allocating device memory");
|
||||
}
|
||||
error:
|
||||
xenfb_remove(dev);
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue