From aa58f7c4ed5a10f3469bdd1d7385cbf8ce48b2a7 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Wed, 28 Apr 2010 16:59:36 -0400 Subject: [PATCH] --- yaml --- r: 195428 b: refs/heads/master c: 993e33b032cfc072898bab78b8fa8b21bc666c7e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/sisusbvga/sisusb_con.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f611de616c29..dcbb88b7ed5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d7917bcbd9bdc61e7daa46ce74f7032aa4bfb3d +refs/heads/master: 993e33b032cfc072898bab78b8fa8b21bc666c7e diff --git a/trunk/drivers/usb/misc/sisusbvga/sisusb_con.c b/trunk/drivers/usb/misc/sisusbvga/sisusb_con.c index b271b0557a1f..411e605f448a 100644 --- a/trunk/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/trunk/drivers/usb/misc/sisusbvga/sisusb_con.c @@ -1187,9 +1187,9 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot, * And so is the hi_font_mask. */ for (i = 0; i < MAX_NR_CONSOLES; i++) { - struct vc_data *c = vc_cons[i].d; - if (c && c->vc_sw == &sisusb_con) - c->vc_hi_font_mask = ch512 ? 0x0800 : 0; + struct vc_data *d = vc_cons[i].d; + if (d && d->vc_sw == &sisusb_con) + d->vc_hi_font_mask = ch512 ? 0x0800 : 0; } sisusb->current_font_512 = ch512; @@ -1249,7 +1249,7 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot, mutex_unlock(&sisusb->lock); if (dorecalc && c) { - int i, rows = c->vc_scan_lines / fh; + int rows = c->vc_scan_lines / fh; /* Now adjust our consoles' size */