diff options
| -rw-r--r-- | drivers/block/rd.c | 3 | ||||
| -rw-r--r-- | drivers/pnp/resource.c | 11 | ||||
| -rw-r--r-- | drivers/scsi/fd_mcs.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/gdth.c | 2 | ||||
| -rw-r--r-- | drivers/video/i810/i810_main.c | 2 | ||||
| -rw-r--r-- | drivers/video/vgastate.c | 1 |
6 files changed, 9 insertions, 11 deletions
diff --git a/drivers/block/rd.c b/drivers/block/rd.c index bbfc4eaa3927..97cc4275319d 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c @@ -271,9 +271,6 @@ static int rd_open(struct inode * inode, struct file * filp) { unsigned unit = minor(inode->i_rdev); - if (unit >= NUM_RAMDISKS) - return -ENODEV; - /* * Immunize device against invalidate_buffers() and prune_icache(). */ diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 3259ed7c3789..978decf7504a 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -85,7 +85,6 @@ struct pnp_option * pnp_register_dependent_option(struct pnp_dev *dev, int prior int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data) { - int i; struct pnp_irq *ptr; if (!option) return -EINVAL; @@ -101,9 +100,13 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data) option->irq = data; #ifdef CONFIG_PCI - for (i=0; i<16; i++) - if (data->map & (1<<i)) - pcibios_penalize_isa_irq(i); + { + int i; + + for (i=0; i<16; i++) + if (data->map & (1<<i)) + pcibios_penalize_isa_irq(i); + } #endif return 0; } diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c index 677c91df0b86..4ca10ec3d85c 100644 --- a/drivers/scsi/fd_mcs.c +++ b/drivers/scsi/fd_mcs.c @@ -589,7 +589,6 @@ static int TOTAL_INTR = 0; static int fd_mcs_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start, off_t offset, int length, int inout) { int len = 0; - int i; if (inout) return (-ENOSYS); diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index 68d28656735e..ac728053acc3 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -3662,7 +3662,7 @@ static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp) pci_unmap_single(ha->pdev,scp->SCp.dma_handle, scp->request_bufflen,scp->SCp.Message); if (scp->SCp.buffer) - pci_unmap_single(ha->pdev,(dma_addr_t)(u32)scp->SCp.buffer, + pci_unmap_single(ha->pdev,(dma_addr_t)scp->SCp.buffer, 16,PCI_DMA_FROMDEVICE); #endif if (ha->status == S_OK) { diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index 0334f1c10da2..5cf5e7d02b30 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c @@ -1075,8 +1075,6 @@ static int i810fb_getcolreg(u8 regno, u8 *red, u8 *green, u8 *blue, struct i810fb_par *par = (struct i810fb_par *) info->par; u8 *mmio = par->mmio_start_virtual, temp; - if (regno > 255) return 1; - if (info->fix.visual == FB_VISUAL_DIRECTCOLOR) { if ((info->var.green.length == 5 && regno > 31) || (info->var.green.length == 6 && regno > 63)) diff --git a/drivers/video/vgastate.c b/drivers/video/vgastate.c index 99ffe59f60cc..37b1ed7279cd 100644 --- a/drivers/video/vgastate.c +++ b/drivers/video/vgastate.c @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/fb.h> +#include <linux/vmalloc.h> #include <video/vga.h> struct regstate { |