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
spelling fixes
[pandora-kernel.git]
/
drivers
/
scsi
/
st.c
diff --git
a/drivers/scsi/st.c
b/drivers/scsi/st.c
index
56cb490
..
b5218fc
100644
(file)
--- a/
drivers/scsi/st.c
+++ b/
drivers/scsi/st.c
@@
-1193,7
+1193,7
@@
static int st_open(struct inode *inode, struct file *filp)
\f
/* Flush the tape buffer before close */
\f
/* Flush the tape buffer before close */
-static int st_flush(struct file *filp)
+static int st_flush(struct file *filp
, fl_owner_t id
)
{
int result = 0, result2;
unsigned char cmd[MAX_COMMAND_SIZE];
{
int result = 0, result2;
unsigned char cmd[MAX_COMMAND_SIZE];
@@
-2818,7
+2818,7
@@
static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon
(cmdstatp->sense_hdr.sense_key == NO_SENSE ||
cmdstatp->sense_hdr.sense_key == RECOVERED_ERROR) &&
undone == 0) {
(cmdstatp->sense_hdr.sense_key == NO_SENSE ||
cmdstatp->sense_hdr.sense_key == RECOVERED_ERROR) &&
undone == 0) {
- ioctl_result = 0; /* EOF written succesfully at EOM */
+ ioctl_result = 0; /* EOF written succes
s
fully at EOM */
if (fileno >= 0)
fileno++;
STps->drv_file = fileno;
if (fileno >= 0)
fileno++;
STps->drv_file = fileno;
@@
-3839,7
+3839,7
@@
static int __init st_setup(char *str)
break;
}
}
break;
}
}
- if (i >=
sizeof(parms) / sizeof(struct st_dev_parm
))
+ if (i >=
ARRAY_SIZE(parms
))
printk(KERN_WARNING "st: invalid parameter in '%s'\n",
stp);
stp = strchr(stp, ',');
printk(KERN_WARNING "st: invalid parameter in '%s'\n",
stp);
stp = strchr(stp, ',');