git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
block
/
paride
/
pcd.c
diff --git
a/drivers/block/paride/pcd.c
b/drivers/block/paride/pcd.c
index
876a236
..
4ab5efa
100644
(file)
--- a/
drivers/block/paride/pcd.c
+++ b/
drivers/block/paride/pcd.c
@@
-259,7
+259,7
@@
static int pcd_block_ioctl(struct inode *inode, struct file *file,
unsigned cmd, unsigned long arg)
{
struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
unsigned cmd, unsigned long arg)
{
struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
- return cdrom_ioctl(
file,
&cd->info, inode, cmd, arg);
+ return cdrom_ioctl(&cd->info, inode, cmd, arg);
}
static int pcd_block_media_changed(struct gendisk *disk)
}
static int pcd_block_media_changed(struct gendisk *disk)
@@
-752,7
+752,7
@@
static void do_pcd_request(request_queue_t * q)
pcd_count = pcd_req->current_nr_sectors;
pcd_buf = pcd_req->buffer;
pcd_busy = 1;
pcd_count = pcd_req->current_nr_sectors;
pcd_buf = pcd_req->buffer;
pcd_busy = 1;
- ps_set_intr(do_pcd_read,
NULL
, 0, nice);
+ ps_set_intr(do_pcd_read,
0
, 0, nice);
return;
} else
end_request(pcd_req, 0);
return;
} else
end_request(pcd_req, 0);