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 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
drivers
/
scsi
/
pmcraid.c
diff --git
a/drivers/scsi/pmcraid.c
b/drivers/scsi/pmcraid.c
index
7f636b1
..
d079f9a
100644
(file)
--- a/
drivers/scsi/pmcraid.c
+++ b/
drivers/scsi/pmcraid.c
@@
-3871,6
+3871,9
@@
static long pmcraid_ioctl_passthrough(
pmcraid_err("couldn't build passthrough ioadls\n");
goto out_free_buffer;
}
pmcraid_err("couldn't build passthrough ioadls\n");
goto out_free_buffer;
}
+ } else if (request_size < 0) {
+ rc = -EINVAL;
+ goto out_free_buffer;
}
/* If data is being written into the device, copy the data from user
}
/* If data is being written into the device, copy the data from user
@@
-4252,8
+4255,8
@@
static ssize_t pmcraid_show_drv_version(
char *buf
)
{
char *buf
)
{
- return snprintf(buf, PAGE_SIZE, "version: %s
, build date: %s
\n",
- PMCRAID_DRIVER_VERSION
, PMCRAID_DRIVER_DATE
);
+ return snprintf(buf, PAGE_SIZE, "version: %s\n",
+ PMCRAID_DRIVER_VERSION);
}
static struct device_attribute pmcraid_driver_version_attr = {
}
static struct device_attribute pmcraid_driver_version_attr = {
@@
-6096,9
+6099,8
@@
static int __init pmcraid_init(void)
dev_t dev;
int error;
dev_t dev;
int error;
- pmcraid_info("%s Device Driver version: %s %s\n",
- PMCRAID_DRIVER_NAME,
- PMCRAID_DRIVER_VERSION, PMCRAID_DRIVER_DATE);
+ pmcraid_info("%s Device Driver version: %s\n",
+ PMCRAID_DRIVER_NAME, PMCRAID_DRIVER_VERSION);
error = alloc_chrdev_region(&dev, 0,
PMCRAID_MAX_ADAPTERS,
error = alloc_chrdev_region(&dev, 0,
PMCRAID_MAX_ADAPTERS,