← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lowlatency/precise-proposed

« back to all changes in this revision

Viewing changes to drivers/video/fbmem.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-04-04 18:49:36 UTC
  • Revision ID: package-import@ubuntu.com-20120404184936-tqu735914muv4wpg
Tags: 3.2.0-22.30
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-22.35

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-22.35

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/video/fbmem.c
1651
1651
        if (ret)
1652
1652
                return -EINVAL;
1653
1653
 
 
1654
        unlink_framebuffer(fb_info);
1654
1655
        if (fb_info->pixmap.addr &&
1655
1656
            (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT))
1656
1657
                kfree(fb_info->pixmap.addr);
1658
1659
        registered_fb[i] = NULL;
1659
1660
        num_registered_fb--;
1660
1661
        fb_cleanup_device(fb_info);
1661
 
        device_destroy(fb_class, MKDEV(FB_MAJOR, i));
1662
1662
        event.info = fb_info;
1663
1663
        fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
1664
1664
 
1667
1667
        return 0;
1668
1668
}
1669
1669
 
 
1670
int unlink_framebuffer(struct fb_info *fb_info)
 
1671
{
 
1672
        int i;
 
1673
 
 
1674
        i = fb_info->node;
 
1675
        if (i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)
 
1676
                return -EINVAL;
 
1677
 
 
1678
        if (fb_info->dev) {
 
1679
                device_destroy(fb_class, MKDEV(FB_MAJOR, i));
 
1680
                fb_info->dev = NULL;
 
1681
        }
 
1682
        return 0;
 
1683
}
 
1684
EXPORT_SYMBOL(unlink_framebuffer);
 
1685
 
1670
1686
void remove_conflicting_framebuffers(struct apertures_struct *a,
1671
1687
                                     const char *name, bool primary)
1672
1688
{