diff options
Diffstat (limited to 'drivers/sbus/char')
-rw-r--r-- | drivers/sbus/char/openprom.c | 2 | ||||
-rw-r--r-- | drivers/sbus/char/uctrl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 2f698763ba5d..81ba2d71cee2 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c | |||
@@ -630,7 +630,7 @@ static int openprom_ioctl(struct inode * inode, struct file * file, | |||
630 | case OPROMPATH2NODE: | 630 | case OPROMPATH2NODE: |
631 | if ((file->f_mode & FMODE_READ) == 0) | 631 | if ((file->f_mode & FMODE_READ) == 0) |
632 | return -EPERM; | 632 | return -EPERM; |
633 | return openprom_sunos_ioctl(inode, file, cmd, arg, 0); | 633 | return openprom_sunos_ioctl(inode, file, cmd, arg, NULL); |
634 | 634 | ||
635 | case OPIOCGET: | 635 | case OPIOCGET: |
636 | case OPIOCNEXTPROP: | 636 | case OPIOCNEXTPROP: |
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index ddc0681ac759..b30372f17f1c 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
@@ -400,7 +400,7 @@ static int __init ts102_uctrl_init(void) | |||
400 | } | 400 | } |
401 | 401 | ||
402 | driver->regs->uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK; | 402 | driver->regs->uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK; |
403 | printk("uctrl: 0x%x (irq %d)\n", driver->regs, driver->irq); | 403 | printk("uctrl: 0x%p (irq %d)\n", driver->regs, driver->irq); |
404 | uctrl_get_event_status(); | 404 | uctrl_get_event_status(); |
405 | uctrl_get_external_status(); | 405 | uctrl_get_external_status(); |
406 | return 0; | 406 | return 0; |