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
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
block
/
paride
/
pcd.c
diff --git
a/drivers/block/paride/pcd.c
b/drivers/block/paride/pcd.c
index
9f3518c
..
71acf4e
100644
(file)
--- a/
drivers/block/paride/pcd.c
+++ b/
drivers/block/paride/pcd.c
@@
-247,7
+247,7
@@
static int pcd_block_media_changed(struct gendisk *disk)
return cdrom_media_changed(&cd->info);
}
return cdrom_media_changed(&cd->info);
}
-static struct block_device_operations pcd_bdops = {
+static
const
struct block_device_operations pcd_bdops = {
.owner = THIS_MODULE,
.open = pcd_block_open,
.release = pcd_block_release,
.owner = THIS_MODULE,
.open = pcd_block_open,
.release = pcd_block_release,
@@
-341,11
+341,11
@@
static int pcd_wait(struct pcd_unit *cd, int go, int stop, char *fun, char *msg)
&& (j++ < PCD_SPIN))
udelay(PCD_DELAY);
&& (j++ < PCD_SPIN))
udelay(PCD_DELAY);
- if ((r & (IDE_ERR & stop)) || (j >
=
PCD_SPIN)) {
+ if ((r & (IDE_ERR & stop)) || (j > PCD_SPIN)) {
s = read_reg(cd, 7);
e = read_reg(cd, 1);
p = read_reg(cd, 2);
s = read_reg(cd, 7);
e = read_reg(cd, 1);
p = read_reg(cd, 2);
- if (j >
=
PCD_SPIN)
+ if (j > PCD_SPIN)
e |= 0x100;
if (fun)
printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x"
e |= 0x100;
if (fun)
printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x"