5 files changed, 35 insertions, 25 deletions

diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 4dff49256ac2..317a790c153b 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -417,7 +417,7 @@ static int __send_request(struct request *req)
         desc->req_id = port->req_id;
         desc->operation = op;
         if (port->vdisk_type == VD_DISK_TYPE_DISK) {
-                desc->slice = 2;
+                desc->slice = 0xff;
         } else {
                 desc->slice = 0;
         }
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 79b13685bdfa..e074943feff5 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1198,10 +1198,11 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)
         if (up->port.type == PORT_UNKNOWN)
                 return -ENODEV;
 
-        printk("%s: %s port at %lx, irq %u\n",
+        printk("%s: %s port at %llx, irq %u\n",
                to_of_device(up->port.dev)->node->full_name,
                (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
-               up->port.mapbase, up->port.irq);
+               (unsigned long long) up->port.mapbase,
+               up->port.irq);
 
 #ifdef CONFIG_SERIO
         serio = &up->serio;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 1d262c0c613f..283bef0d24cb 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1431,14 +1431,16 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
                         return err;
                 }
         } else {
-                printk(KERN_INFO "%s: Keyboard at MMIO 0x%lx (irq = %d) "
+                printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
-                       op->dev.bus_id, up[0].port.mapbase, op->irqs[0],
-                       sunzilog_type (&up[0].port));
-                printk(KERN_INFO "%s: Mouse at MMIO 0x%lx (irq = %d) "
+                       op->dev.bus_id,
+                       (unsigned long long) up[0].port.mapbase,
+                       op->irqs[0], sunzilog_type(&up[0].port));
+                printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
-                       op->dev.bus_id, up[1].port.mapbase, op->irqs[0],
-                       sunzilog_type (&up[1].port));
+                       op->dev.bus_id,
+                       (unsigned long long) up[1].port.mapbase,
+                       op->irqs[0], sunzilog_type(&up[1].port));
         }
 
         dev_set_drvdata(&op->dev, &up[0]);
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 718b9f83736e..833b10c84064 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -233,9 +233,9 @@ static u8 bw2regs_66hz[] __devinitdata = {
         0x10, 0x20,     0
 };
 
-static void __devinit bw2_do_default_mode(struct bw2_par *par,
-                                          struct fb_info *info,
-                                          int *linebytes)
+static int __devinit bw2_do_default_mode(struct bw2_par *par,
+                                         struct fb_info *info,
+                                         int *linebytes)
 {
         u8 status, mon;
         u8 *p;
@@ -266,17 +266,18 @@ static void __devinit bw2_do_default_mode(struct bw2_par *par,
                 break;
 
         case BWTWO_SR_ID_NOCONN:
-                return;
+                return 0;
 
         default:
-                prom_printf("bw2: can't handle SR %02x\n",
-                            status);
-                prom_halt();
+                printk(KERN_ERR "bw2: can't handle SR %02x\n",
+                       status);
+                return -EINVAL;
         }
         for ( ; *p; p += 2) {
                 u8 __iomem *regp = &((u8 __iomem *)par->regs)[p[0]];
                 sbus_writeb(p[1], regp);
         }
+        return 0;
 }
 
 static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match)
@@ -312,8 +313,11 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
         if (!par->regs)
                 goto out_release_fb;
 
-        if (!of_find_property(dp, "width", NULL))
-                bw2_do_default_mode(par, info, &linebytes);
+        if (!of_find_property(dp, "width", NULL)) {
+                err = bw2_do_default_mode(par, info, &linebytes);
+                if (err)
+                        goto out_unmap_regs;
+        }
 
         par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
 
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 5741b46ade1b..a5c7fb331527 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -315,7 +315,7 @@ static u_char cg3_dacvals[] __devinitdata = {
         4, 0xff,        5, 0x00,        6, 0x70,        7, 0x00,        0
 };
 
-static void __devinit cg3_do_default_mode(struct cg3_par *par)
+static int __devinit cg3_do_default_mode(struct cg3_par *par)
 {
         enum cg3_type type;
         u8 *p;
@@ -332,10 +332,9 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                         else
                                 type = CG3_AT_66HZ;
                 } else {
-                        prom_printf("cgthree: can't handle SR %02x\n",
-                                    status);
-                        prom_halt();
-                        return;
+                        printk(KERN_ERR "cgthree: can't handle SR %02x\n",
+                               status);
+                        return -EINVAL;
                 }
         }
 
@@ -351,6 +350,7 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                 regp = (u8 __iomem *)&par->regs->cmap.control;
                 sbus_writeb(p[1], regp);
         }
+        return 0;
 }
 
 static int __devinit cg3_probe(struct of_device *op,
@@ -400,8 +400,11 @@ static int __devinit cg3_probe(struct of_device *op,
 
         cg3_blank(0, info);
 
-        if (!of_find_property(dp, "width", NULL))
-                cg3_do_default_mode(par);
+        if (!of_find_property(dp, "width", NULL)) {
+                err = cg3_do_default_mode(par);
+                if (err)
+                        goto out_unmap_screen;
+        }
 
         if (fb_alloc_cmap(&info->cmap, 256, 0))
                 goto out_unmap_screen;