projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omap: mailbox: correct the argument type for irq ops
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap1
/
mailbox.c
diff --git
a/arch/arm/mach-omap1/mailbox.c
b/arch/arm/mach-omap1/mailbox.c
index efc8f207f6fcd7845065b569f835764ff47e9ba5..7246a5258292893c6e882e3668f92f4a5c6e4f1d 100644
(file)
--- a/
arch/arm/mach-omap1/mailbox.c
+++ b/
arch/arm/mach-omap1/mailbox.c
@@
-86,21
+86,21
@@
static int omap1_mbox_fifo_full(struct omap_mbox *mbox)
/* irq */
static void
/* irq */
static void
-omap1_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_
type
_t irq)
+omap1_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_
irq
_t irq)
{
if (irq == IRQ_RX)
enable_irq(mbox->irq);
}
static void
{
if (irq == IRQ_RX)
enable_irq(mbox->irq);
}
static void
-omap1_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_
type
_t irq)
+omap1_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_
irq
_t irq)
{
if (irq == IRQ_RX)
disable_irq(mbox->irq);
}
static int
{
if (irq == IRQ_RX)
disable_irq(mbox->irq);
}
static int
-omap1_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_
type
_t irq)
+omap1_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_
irq
_t irq)
{
if (irq == IRQ_TX)
return 0;
{
if (irq == IRQ_TX)
return 0;
@@
-152,6
+152,9
@@
static int omap1_mbox_probe(struct platform_device *pdev)
list[0]->irq = platform_get_irq_byname(pdev, "dsp");
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
list[0]->irq = platform_get_irq_byname(pdev, "dsp");
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!mem)
+ return -ENOENT;
+
mbox_base = ioremap(mem->start, resource_size(mem));
if (!mbox_base)
return -ENOMEM;
mbox_base = ioremap(mem->start, resource_size(mem));
if (!mbox_base)
return -ENOMEM;