Selaa lähdekoodia

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>
Bill Pemberton 15 vuotta sitten
vanhempi
commit
993e33b032
1 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 4 4
      drivers/usb/misc/sisusbvga/sisusb_con.c

+ 4 - 4
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.
 		 * And so is the hi_font_mask.
 		 */
 		 */
 		for (i = 0; i < MAX_NR_CONSOLES; i++) {
 		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;
 		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);
 		mutex_unlock(&sisusb->lock);
 
 
 	if (dorecalc && c) {
 	if (dorecalc && c) {
-		int i, rows = c->vc_scan_lines / fh;
+		int rows = c->vc_scan_lines / fh;
 
 
 		/* Now adjust our consoles' size */
 		/* Now adjust our consoles' size */