diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 06:26:32 (GMT) |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 06:26:32 (GMT) |
commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
tree | 233a923281fb640106465d076997ff511efb6edf /drivers/cdrom/cm206.c | |
parent | 2c8dc071517ec2843869024dc82be2e246f41064 (diff) | |
parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
download | linux-fsl-qoriq-b22364c8eec89e6b0c081a237f3b6348df87796f.tar.xz |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/cdrom/cm206.c')
-rw-r--r-- | drivers/cdrom/cm206.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index e6d8e9e..b6c61bb 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c @@ -1420,7 +1420,7 @@ int __init cm206_init(void) 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 |