Merge branches 'sh/smp' and 'sh/stable-updates'

This commit is contained in:
Paul Mundt 2009-09-08 16:27:31 +09:00
commit e7a963ef20
229 changed files with 2330 additions and 1577 deletions

View file

@ -454,6 +454,10 @@ 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;
ret = register_framebuffer(fb_info);
if (ret) {
fb_deferred_io_cleanup(fb_info);
@ -464,10 +468,6 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
}
info->fb_info = fb_info;
ret = xenfb_connect_backend(dev, info);
if (ret < 0)
goto error;
xenfb_make_preferred_console();
return 0;