Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 993e33b0 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

usb: sisusb_con.c: fix shadows sparse warning 



Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7d7917bc

drivers/usb/misc/sisusbvga/sisusb_con.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -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;

			struct vc_data *d = vc_cons[i].d;

			if (c && c->vc_sw == &sisusb_con)

			if (d && d->vc_sw == &sisusb_con)

				c->vc_hi_font_mask = ch512 ? 0x0800 : 0;

				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 */