gwj / at91sam9263 · Commits

Commit fdb868e410c598f8a3a11d6c23f08380aa359623

Authored by aliguori
1 parent 42aa98e8

Squash warnings in console.c 

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6354 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 1 additions and 3 deletions
console.c
  View file @fdb868e
@@ -1299,7 +1299,7 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds, const c @@ -1299,7 +1299,7 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds, const c
1299 s = new_console(ds, (p == 0) ? TEXT_CONSOLE : TEXT_CONSOLE_FIXED_SIZE); 1299 s = new_console(ds, (p == 0) ? TEXT_CONSOLE : TEXT_CONSOLE_FIXED_SIZE);
1300 if (!s) { 1300 if (!s) {
1301 free(chr); 1301 free(chr);
1302 - return NULL; 1302 + return;
1303 } 1303 }
1304 chr->opaque = s; 1304 chr->opaque = s;
1305 chr->chr_write = console_puts; 1305 chr->chr_write = console_puts;
@@ -1357,8 +1357,6 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds, const c @@ -1357,8 +1357,6 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds, const c
1357 text_console_resize(s); 1357 text_console_resize(s);
1358 1358
1359 qemu_chr_reset(chr); 1359 qemu_chr_reset(chr);
1360 -  
1361 - return chr;  
1362 } 1360 }
1363 1361
1364 CharDriverState *text_console_init(const char *p) 1362 CharDriverState *text_console_init(const char *p)