diff options
Diffstat (limited to 'pciradio.c')
| -rw-r--r-- | pciradio.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -169,8 +169,8 @@ struct pciradio { volatile unsigned long ioaddr; dma_addr_t readdma; dma_addr_t writedma; - volatile int *writechunk; /* Double-word aligned write memory */ - volatile int *readchunk; /* Double-word aligned read memory */ + volatile unsigned int *writechunk; /* Double-word aligned write memory */ + volatile unsigned int *readchunk; /* Double-word aligned read memory */ unsigned char saudio_status[NUM_CHANS]; char gotcor[NUM_CHANS]; char gotct[NUM_CHANS]; @@ -539,7 +539,7 @@ unsigned long flags; static void _do_encdec(struct pciradio *rad) { int i,n; -unsigned char byte1,byte2; +unsigned char byte1 = 0, byte2 = 0; /* return doing nothing if busy */ if ((rad->encdec.lastcmd + 2) > jiffies) return; @@ -1258,7 +1258,7 @@ static int pciradio_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long if ((rad->rxindex < stack.p.data) && (rad->srxtimer < SRX_TIMEOUT) && ((rad->remmode[chan->chanpos - 1] == ZT_RADPAR_REM_SERIAL) || - (!strchr(rad->rxbuf,'\r')))) + (!strchr((char *) rad->rxbuf,'\r')))) { spin_unlock_irqrestore(&rad->lock,flags); interruptible_sleep_on_timeout(&mywait,2); @@ -1660,7 +1660,7 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de /* Allocate enough memory for two zt chunks, receive and transmit. Each sample uses 32 bits. Allocate an extra set just for control too */ - rad->writechunk = (int *)pci_alloc_consistent(pdev, ZT_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, &rad->writedma); + rad->writechunk = pci_alloc_consistent(pdev, ZT_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, &rad->writedma); if (!rad->writechunk) { printk("pciradio: Unable to allocate DMA-able memory\n"); if (rad->freeregion) |