← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/video/console/fbcon.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/video/console/fbcon.c
370
370
{
371
371
        struct fb_info *info = container_of(work, struct fb_info, queue);
372
372
        struct fbcon_ops *ops = info->fbcon_par;
373
 
        struct display *p;
374
373
        struct vc_data *vc = NULL;
375
374
        int c;
376
375
        int mode;
386
385
                return;
387
386
        }
388
387
 
389
 
        p = &fb_display[vc->vc_num];
390
388
        c = scr_readw((u16 *) vc->vc_pos);
391
389
        mode = (!ops->cursor_flash || ops->cursor_state.enable) ?
392
390
                CM_ERASE : CM_DRAW;
823
821
        if (oldidx == newidx)
824
822
                return 0;
825
823
 
826
 
        if (!info || fbcon_has_exited)
 
824
        if (!info)
827
825
                return -EINVAL;
828
826
 
829
 
        if (!err && !search_for_mapped_con()) {
 
827
        if (!search_for_mapped_con() || !con_is_bound(&fb_con)) {
830
828
                info_idx = newidx;
831
829
                return fbcon_takeover(0);
832
830
        }