3 files changed, 9 insertions, 11 deletions

diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index b16e6138fdd4..bb71fea07284 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -159,8 +159,7 @@ static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
                 else
                         dev_warn(&chan->par->pcidev->dev,
                                  "Failed to register I2C bus %s.\n", name);
-        } else
-                chan->par = NULL;
+        }
 
         return rc;
 }
@@ -170,9 +169,8 @@ void savagefb_create_i2c_busses(struct fb_info *info)
         struct savagefb_par *par = info->par;
         par->chan.par   = par;
 
-        switch(info->fix.accel) {
-        case FB_ACCEL_PROSAVAGE_DDRK:
-        case FB_ACCEL_PROSAVAGE_PM:
+        switch (par->chip) {
+        case S3_PROSAVAGE:
                 par->chan.reg         = CR_SERIAL2;
                 par->chan.ioaddr      = par->mmio.vbase;
                 par->chan.algo.setsda = prosavage_gpio_setsda;
@@ -180,7 +178,7 @@ void savagefb_create_i2c_busses(struct fb_info *info)
                 par->chan.algo.getsda = prosavage_gpio_getsda;
                 par->chan.algo.getscl = prosavage_gpio_getscl;
                 break;
-        case FB_ACCEL_SAVAGE4:
+        case S3_SAVAGE4:
                 par->chan.reg = CR_SERIAL1;
                 if (par->pcidev->revision > 1 && !(VGArCR(0xa6, par) & 0x40))
                         par->chan.reg = CR_SERIAL2;
@@ -190,8 +188,8 @@ void savagefb_create_i2c_busses(struct fb_info *info)
                 par->chan.algo.getsda = prosavage_gpio_getsda;
                 par->chan.algo.getscl = prosavage_gpio_getscl;
                 break;
-        case FB_ACCEL_SAVAGE2000:
-                par->chan.reg         = 0xff20;
+        case S3_SAVAGE2000:
+                par->chan.reg         = MM_SERIAL1;
                 par->chan.ioaddr      = par->mmio.vbase;
                 par->chan.algo.setsda = savage4_gpio_setsda;
                 par->chan.algo.setscl = savage4_gpio_setscl;
diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
index e4c3f214eb8e..4e9490c19d7d 100644
--- a/drivers/video/savage/savagefb.h
+++ b/drivers/video/savage/savagefb.h
@@ -153,7 +153,7 @@ struct savage_reg {
         unsigned char CRTC[25];       /* Crtc Controller */
         unsigned char Sequencer[5];   /* Video Sequencer */
         unsigned char Graphics[9];    /* Video Graphics */
-        unsigned char Attribute[21];  /* Video Atribute */
+        unsigned char Attribute[21];  /* Video Attribute */
 
         unsigned int mode, refresh;
         unsigned char SR08, SR0E, SR0F;
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 487911e2926c..a2dc1a7ec758 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -385,7 +385,7 @@ SavageSetup2DEngine(struct savagefb_par  *par)
         BCI_SEND(GlobalBitmapDescriptor);
 
         /*
-         * I don't know why, sending this twice fixes the intial black screen,
+         * I don't know why, sending this twice fixes the initial black screen,
          * prevents X from crashing at least in Toshiba laptops with SavageIX.
          * --Tony
          */
@@ -2211,7 +2211,7 @@ static int __devinit savagefb_probe(struct pci_dev* dev,
                 goto failed_mmio;
 
         video_len = savage_init_hw(par);
-        /* FIXME: cant be negative */
+        /* FIXME: can't be negative */
         if (video_len < 0) {
                 err = video_len;
                 goto failed_mmio;