[KJ] drivers/usb/misc/sisusbvga/sisusb.c: fix warning: 'assignment

[KJ] drivers/usb/misc/sisusbvga/sisusb.c: fix warning: 'assignment

[walter harms]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

fix a warning 'assignment discards qualifiers' . also a bit cleanup.

sign-off-by: walter <wharms@bfs.de>


--- linux-2.6.14/drivers/usb/misc/sisusbvga/sisusb.c.bak	2005-12-03 
21:23:38.000000000 +0100
+++ linux-2.6.14/drivers/usb/misc/sisusbvga/sisusb.c	2005-12-03 
21:50:02.000000000 +0100
@@ -2440,7 +2440,7 @@
  sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init)
  {
  	int ret = 0, slot = sisusb->font_slot, i;
-	struct font_desc *myfont;
+	const struct font_desc *myfont;
  	u8 *tempbuf;
  	u16 *tempbufb;
  	size_t written;
@@ -2458,10 +2458,12 @@
  	/* Set mode 0x03 */
  	SiSUSBSetMode(sisusb->SiS_Pr, 0x03);

-	if (!(myfont = find_font("VGA8x16")))
+	myfont = find_font("VGA8x16");
+	if (!myfont)
  		return 1;

-	if (!(tempbuf = vmalloc(8192)))
+	tempbuf = vmalloc(8192);
+	if (!tempbuf)
  		return 1;

  	for (i = 0; i < 256; i++)

[-- Attachment #2: sisusb.c.diff --]
[-- Type: text/x-patch, Size: 844 bytes --]

fix a warning 'assignment discards qualifiers' . also a bit cleanup.

sign-off: walter <wharms@bfs.de>


--- linux-2.6.14/drivers/usb/misc/sisusbvga/sisusb.c.bak	2005-12-03 21:23:38.000000000 +0100
+++ linux-2.6.14/drivers/usb/misc/sisusbvga/sisusb.c	2005-12-03 21:50:02.000000000 +0100
@@ -2440,7 +2440,7 @@
 sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init)
 {
 	int ret = 0, slot = sisusb->font_slot, i;
-	struct font_desc *myfont;
+	const struct font_desc *myfont;
 	u8 *tempbuf;
 	u16 *tempbufb;
 	size_t written;
@@ -2458,10 +2458,12 @@
 	/* Set mode 0x03 */
 	SiSUSBSetMode(sisusb->SiS_Pr, 0x03);
 
-	if (!(myfont = find_font("VGA8x16")))
+	myfont = find_font("VGA8x16");
+	if (!myfont)
 		return 1;
 
-	if (!(tempbuf = vmalloc(8192)))
+	tempbuf = vmalloc(8192);
+	if (!tempbuf)
 		return 1;
 
 	for (i = 0; i < 256; i++)

[-- Attachment #3: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors