aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2010-04-28 16:59:36 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 16:21:41 -0400
commit993e33b032cfc072898bab78b8fa8b21bc666c7e (patch)
tree9b39f0cfc301ef9b165d94b95d02c0b004347126 /drivers/usb/misc
parent7d7917bcbd9bdc61e7daa46ce74f7032aa4bfb3d (diff)
usb: sisusb_con.c: fix shadows sparse warning
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/sisusbvga/sisusb_con.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c
index b271b0557a1f..411e605f448a 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_con.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_con.c
@@ -1187,9 +1187,9 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,
1187 * And so is the hi_font_mask. 1187 * And so is the hi_font_mask.
1188 */ 1188 */
1189 for (i = 0; i < MAX_NR_CONSOLES; i++) { 1189 for (i = 0; i < MAX_NR_CONSOLES; i++) {
1190 struct vc_data *c = vc_cons[i].d; 1190 struct vc_data *d = vc_cons[i].d;
1191 if (c && c->vc_sw == &sisusb_con) 1191 if (d && d->vc_sw == &sisusb_con)
1192 c->vc_hi_font_mask = ch512 ? 0x0800 : 0; 1192 d->vc_hi_font_mask = ch512 ? 0x0800 : 0;
1193 } 1193 }
1194 1194
1195 sisusb->current_font_512 = ch512; 1195 sisusb->current_font_512 = ch512;
@@ -1249,7 +1249,7 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,
1249 mutex_unlock(&sisusb->lock); 1249 mutex_unlock(&sisusb->lock);
1250 1250
1251 if (dorecalc && c) { 1251 if (dorecalc && c) {
1252 int i, rows = c->vc_scan_lines / fh; 1252 int rows = c->vc_scan_lines / fh;
1253 1253
1254 /* Now adjust our consoles' size */ 1254 /* Now adjust our consoles' size */
1255 1255