projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] celleb: Fix parsing of machine type hack command line option
[powerpc.git]
/
drivers
/
ps3
/
vuart.c
diff --git
a/drivers/ps3/vuart.c
b/drivers/ps3/vuart.c
index
7d7cab1
..
ec2d36a
100644
(file)
--- a/
drivers/ps3/vuart.c
+++ b/
drivers/ps3/vuart.c
@@
-886,12
+886,12
@@
static int ps3_vuart_probe(struct device *_dev)
if (++vuart_bus_priv.use_count == 1) {
if (++vuart_bus_priv.use_count == 1) {
- result = ps3_
alloc_vuart_irq
(PS3_BINDING_CPU_ANY,
+ result = ps3_
vuart_irq_setup
(PS3_BINDING_CPU_ANY,
(void*)&vuart_bus_priv.bmp.status, &vuart_bus_priv.virq);
if (result) {
dev_dbg(&dev->core,
(void*)&vuart_bus_priv.bmp.status, &vuart_bus_priv.virq);
if (result) {
dev_dbg(&dev->core,
- "%s:%d: ps3_
alloc_vuart_irq
failed (%d)\n",
+ "%s:%d: ps3_
vuart_irq_setup
failed (%d)\n",
__func__, __LINE__, result);
result = -EPERM;
goto fail_alloc_irq;
__func__, __LINE__, result);
result = -EPERM;
goto fail_alloc_irq;
@@
-937,7
+937,7
@@
static int ps3_vuart_probe(struct device *_dev)
fail_probe:
ps3_vuart_set_interrupt_mask(dev, 0);
fail_request_irq:
fail_probe:
ps3_vuart_set_interrupt_mask(dev, 0);
fail_request_irq:
- ps3_
free_vuart_irq
(vuart_bus_priv.virq);
+ ps3_
vuart_irq_destroy
(vuart_bus_priv.virq);
vuart_bus_priv.virq = NO_IRQ;
fail_alloc_irq:
--vuart_bus_priv.use_count;
vuart_bus_priv.virq = NO_IRQ;
fail_alloc_irq:
--vuart_bus_priv.use_count;
@@
-975,7
+975,7
@@
static int ps3_vuart_remove(struct device *_dev)
if (--vuart_bus_priv.use_count == 0) {
BUG();
free_irq(vuart_bus_priv.virq, &vuart_bus_priv);
if (--vuart_bus_priv.use_count == 0) {
BUG();
free_irq(vuart_bus_priv.virq, &vuart_bus_priv);
- ps3_
free_vuart_irq
(vuart_bus_priv.virq);
+ ps3_
vuart_irq_destroy
(vuart_bus_priv.virq);
vuart_bus_priv.virq = NO_IRQ;
}
vuart_bus_priv.virq = NO_IRQ;
}