Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / video / kyro / fbdev.c

diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index 6157f74ac600529d66f8d71fa8f6d3d5d95a5e5a..50c857477e4f1fff39527a4570fc4bf16a640c5e 100644 (file)
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@@ -623,7 +623,6 @@ static int kyrofb_ioctl(struct fb_info *info,
                                "command instead.\n");
                        return -EINVAL;
                }
-               break;
        case KYRO_IOCTL_UVSTRIDE:
                if (copy_to_user(argp, &deviceInfo.ulOverlayUVStride, sizeof(unsigned long)))
                        return -EFAULT;
@@ -736,10 +735,10 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (register_framebuffer(info) < 0)
                goto out_unmap;
 
-       printk("fb%d: %s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n",
-              info->node, info->fix.id, info->var.xres,
-              info->var.yres, info->var.bits_per_pixel, size >> 10,
-              (unsigned long)info->fix.smem_len >> 10);
+       fb_info(info, "%s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n",
+               info->fix.id,
+               info->var.xres, info->var.yres, info->var.bits_per_pixel,
+               size >> 10, (unsigned long)info->fix.smem_len >> 10);
 
        pci_set_drvdata(pdev, info);
 
@@ -779,7 +778,6 @@ static void kyrofb_remove(struct pci_dev *pdev)
 #endif
 
        unregister_framebuffer(info);
-       pci_set_drvdata(pdev, NULL);
        framebuffer_release(info);
 }