patch-2.4.21 linux-2.4.21/arch/ppc/kernel/prom_init.c
Next file: linux-2.4.21/arch/ppc/kernel/ptrace.c
Previous file: linux-2.4.21/arch/ppc/kernel/prom.c
Back to the patch index
Back to the overall index
- Lines: 44
- Date:
2003-06-13 07:51:31.000000000 -0700
- Orig file:
linux-2.4.20/arch/ppc/kernel/prom_init.c
- Orig date:
2002-08-02 17:39:43.000000000 -0700
diff -urN linux-2.4.20/arch/ppc/kernel/prom_init.c linux-2.4.21/arch/ppc/kernel/prom_init.c
@@ -266,7 +266,7 @@
{
phandle node;
ihandle ih;
- int i;
+ int i, j;
char type[16], *path;
static unsigned char default_colors[] = {
0x00, 0x00, 0x00,
@@ -325,26 +325,26 @@
break;
}
-try_again:
/*
* Open the first display and set its colormap.
*/
- if (prom_num_displays > 0) {
- path = prom_display_paths[0];
+ for (j=0; j<prom_num_displays; j++) {
+ path = prom_display_paths[j];
prom_print("opening display ");
prom_print(path);
ih = call_prom("open", 1, 1, path);
if (ih == 0 || ih == (ihandle) -1) {
prom_print("... failed\n");
- for (i=1; i<prom_num_displays; i++) {
+ for (i=j+1; i<prom_num_displays; i++) {
prom_display_paths[i-1] = prom_display_paths[i];
prom_display_nodes[i-1] = prom_display_nodes[i];
}
- if (--prom_num_displays > 0)
- prom_disp_node = prom_display_nodes[0];
- else
+ if (--prom_num_displays > 0) {
+ prom_disp_node = prom_display_nodes[j];
+ j--;
+ } else
prom_disp_node = NULL;
- goto try_again;
+ continue;
} else {
prom_print("... ok\n");
/*
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)