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 'nfs-for-2.6.32'
[pandora-kernel.git]
/
drivers
/
s390
/
block
/
dasd_eer.c
diff --git
a/drivers/s390/block/dasd_eer.c
b/drivers/s390/block/dasd_eer.c
index
c24c8c3
..
d96039e
100644
(file)
--- a/
drivers/s390/block/dasd_eer.c
+++ b/
drivers/s390/block/dasd_eer.c
@@
-6,7
+6,7
@@
* Author(s): Stefan Weinhuber <wein@de.ibm.com>
*/
* Author(s): Stefan Weinhuber <wein@de.ibm.com>
*/
-#define KMSG_COMPONENT "dasd"
+#define KMSG_COMPONENT "dasd
-eckd
"
#include <linux/init.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/fs.h>
@@
-464,7
+464,7
@@
int dasd_eer_enable(struct dasd_device *device)
if (!device->discipline || strcmp(device->discipline->name, "ECKD"))
return -EPERM; /* FIXME: -EMEDIUMTYPE ? */
if (!device->discipline || strcmp(device->discipline->name, "ECKD"))
return -EPERM; /* FIXME: -EMEDIUMTYPE ? */
- cqr = dasd_kmalloc_request(
"ECKD"
, 1 /* SNSS */,
+ cqr = dasd_kmalloc_request(
DASD_ECKD_MAGIC
, 1 /* SNSS */,
SNSS_DATA_SIZE, device);
if (IS_ERR(cqr))
return -ENOMEM;
SNSS_DATA_SIZE, device);
if (IS_ERR(cqr))
return -ENOMEM;