git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pktcdvd: Fix pkt_setup_dev() error path
[pandora-kernel.git]
/
drivers
/
block
/
pktcdvd.c
diff --git
a/drivers/block/pktcdvd.c
b/drivers/block/pktcdvd.c
index
a63b0a2
..
87ba51e
100644
(file)
--- a/
drivers/block/pktcdvd.c
+++ b/
drivers/block/pktcdvd.c
@@
-2885,7
+2885,7
@@
static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
pd->pkt_dev = MKDEV(pktdev_major, idx);
ret = pkt_new_dev(pd, dev);
if (ret)
pd->pkt_dev = MKDEV(pktdev_major, idx);
ret = pkt_new_dev(pd, dev);
if (ret)
- goto out_
new_dev
;
+ goto out_
mem2
;
/* inherit events of the host device */
disk->events = pd->bdev->bd_disk->events;
/* inherit events of the host device */
disk->events = pd->bdev->bd_disk->events;
@@
-2903,8
+2903,6
@@
static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
mutex_unlock(&ctl_mutex);
return 0;
mutex_unlock(&ctl_mutex);
return 0;
-out_new_dev:
- blk_cleanup_queue(disk->queue);
out_mem2:
put_disk(disk);
out_mem:
out_mem2:
put_disk(disk);
out_mem: