|
@@ -4963,7 +4963,7 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp)
|
|
|
buff = kmalloc(iocommand.buf_size, GFP_KERNEL);
|
|
|
if (buff == NULL)
|
|
|
return -EFAULT;
|
|
|
- if (iocommand.Request.Type.Direction == XFER_WRITE) {
|
|
|
+ if (iocommand.Request.Type.Direction & XFER_WRITE) {
|
|
|
/* Copy the data into the buffer we created */
|
|
|
if (copy_from_user(buff, iocommand.buf,
|
|
|
iocommand.buf_size)) {
|
|
@@ -5026,7 +5026,7 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp)
|
|
|
rc = -EFAULT;
|
|
|
goto out;
|
|
|
}
|
|
|
- if (iocommand.Request.Type.Direction == XFER_READ &&
|
|
|
+ if ((iocommand.Request.Type.Direction & XFER_READ) &&
|
|
|
iocommand.buf_size > 0) {
|
|
|
/* Copy the data out of the buffer we created */
|
|
|
if (copy_to_user(iocommand.buf, buff, iocommand.buf_size)) {
|
|
@@ -5103,7 +5103,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
|
|
|
status = -ENOMEM;
|
|
|
goto cleanup1;
|
|
|
}
|
|
|
- if (ioc->Request.Type.Direction == XFER_WRITE) {
|
|
|
+ if (ioc->Request.Type.Direction & XFER_WRITE) {
|
|
|
if (copy_from_user(buff[sg_used], data_ptr, sz)) {
|
|
|
status = -ENOMEM;
|
|
|
goto cleanup1;
|
|
@@ -5155,7 +5155,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
|
|
|
status = -EFAULT;
|
|
|
goto cleanup0;
|
|
|
}
|
|
|
- if (ioc->Request.Type.Direction == XFER_READ && ioc->buf_size > 0) {
|
|
|
+ if ((ioc->Request.Type.Direction & XFER_READ) && ioc->buf_size > 0) {
|
|
|
/* Copy the data out of the buffer we created */
|
|
|
BYTE __user *ptr = ioc->buf;
|
|
|
for (i = 0; i < sg_used; i++) {
|