projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tifm_sd: alter order of the states in the command handler
[powerpc.git]
/
drivers
/
cdrom
/
cm206.c
diff --git
a/drivers/cdrom/cm206.c
b/drivers/cdrom/cm206.c
index
9b05ddd
..
b6c61bb
100644
(file)
--- a/
drivers/cdrom/cm206.c
+++ b/
drivers/cdrom/cm206.c
@@
-359,7
+359,7
@@
static struct tasklet_struct cm206_tasklet;
as there seems so reason for this to happen.
*/
as there seems so reason for this to happen.
*/
-static irqreturn_t cm206_interrupt(int sig, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t cm206_interrupt(int sig, void *dev_id)
{
volatile ush fool;
cd->intr_ds = inw(r_data_status); /* resets data_ready, data_error,
{
volatile ush fool;
cd->intr_ds = inw(r_data_status); /* resets data_ready, data_error,
@@
-1420,7
+1420,7
@@
int __init cm206_init(void)
return -EIO;
}
printk(" adapter at 0x%x", cm206_base);
return -EIO;
}
printk(" adapter at 0x%x", cm206_base);
- cd =
(struct cm206_struct *)
kmalloc(size, GFP_KERNEL);
+ cd = kmalloc(size, GFP_KERNEL);
if (!cd)
goto out_base;
/* Now we have found the adaptor card, try to reset it. As we have
if (!cd)
goto out_base;
/* Now we have found the adaptor card, try to reset it. As we have