git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
storage
/
jumpshot.c
diff --git
a/drivers/usb/storage/jumpshot.c
b/drivers/usb/storage/jumpshot.c
index
ac9c908
..
5031aa9
100644
(file)
--- a/
drivers/usb/storage/jumpshot.c
+++ b/
drivers/usb/storage/jumpshot.c
@@
-47,15
+47,19
@@
* in that routine.
*/
* in that routine.
*/
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "jumpshot.h"
#include "debug.h"
#include "jumpshot.h"
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
static inline int jumpshot_bulk_read(struct us_data *us,
unsigned char *data,
static inline int jumpshot_bulk_read(struct us_data *us,
unsigned char *data,
@@
-319,7
+323,7
@@
static int jumpshot_id_device(struct us_data *us,
}
static int jumpshot_handle_mode_sense(struct us_data *us,
}
static int jumpshot_handle_mode_sense(struct us_data *us,
-
Scsi_C
mnd * srb,
+
struct scsi_c
mnd * srb,
int sense_6)
{
static unsigned char rw_err_page[12] = {
int sense_6)
{
static unsigned char rw_err_page[12] = {
@@
-409,7
+413,7
@@
static int jumpshot_handle_mode_sense(struct us_data *us,
if (sense_6)
ptr[0] = i - 1;
else
if (sense_6)
ptr[0] = i - 1;
else
- ((
u
16 *) ptr)[0] = cpu_to_be16(i - 2);
+ ((
__be
16 *) ptr)[0] = cpu_to_be16(i - 2);
usb_stor_set_xfer_buf(ptr, i, srb);
return USB_STOR_TRANSPORT_GOOD;
usb_stor_set_xfer_buf(ptr, i, srb);
return USB_STOR_TRANSPORT_GOOD;
@@
-426,7
+430,7
@@
static void jumpshot_info_destructor(void *extra)
// Transport for the Lexar 'Jumpshot'
//
// Transport for the Lexar 'Jumpshot'
//
-int jumpshot_transport(
Scsi_C
mnd * srb, struct us_data *us)
+int jumpshot_transport(
struct scsi_c
mnd * srb, struct us_data *us)
{
struct jumpshot_info *info;
int rc;
{
struct jumpshot_info *info;
int rc;
@@
-437,12
+441,11
@@
int jumpshot_transport(Scsi_Cmnd * srb, struct us_data *us)
};
if (!us->extra) {
};
if (!us->extra) {
- us->extra = k
m
alloc(sizeof(struct jumpshot_info), GFP_NOIO);
+ us->extra = k
z
alloc(sizeof(struct jumpshot_info), GFP_NOIO);
if (!us->extra) {
US_DEBUGP("jumpshot_transport: Gah! Can't allocate storage for jumpshot info struct!\n");
return USB_STOR_TRANSPORT_ERROR;
}
if (!us->extra) {
US_DEBUGP("jumpshot_transport: Gah! Can't allocate storage for jumpshot info struct!\n");
return USB_STOR_TRANSPORT_ERROR;
}
- memset(us->extra, 0, sizeof(struct jumpshot_info));
us->extra_destructor = jumpshot_info_destructor;
}
us->extra_destructor = jumpshot_info_destructor;
}
@@
-471,8
+474,8
@@
int jumpshot_transport(Scsi_Cmnd * srb, struct us_data *us)
// build the reply
//
// build the reply
//
- ((
u
32 *) ptr)[0] = cpu_to_be32(info->sectors - 1);
- ((
u
32 *) ptr)[1] = cpu_to_be32(info->ssize);
+ ((
__be
32 *) ptr)[0] = cpu_to_be32(info->sectors - 1);
+ ((
__be
32 *) ptr)[1] = cpu_to_be32(info->ssize);
usb_stor_set_xfer_buf(ptr, 8, srb);
return USB_STOR_TRANSPORT_GOOD;
usb_stor_set_xfer_buf(ptr, 8, srb);
return USB_STOR_TRANSPORT_GOOD;
@@
-551,12
+554,12
@@
int jumpshot_transport(Scsi_Cmnd * srb, struct us_data *us)
if (srb->cmnd[0] == MODE_SENSE) {
US_DEBUGP("jumpshot_transport: MODE_SENSE_6 detected\n");
if (srb->cmnd[0] == MODE_SENSE) {
US_DEBUGP("jumpshot_transport: MODE_SENSE_6 detected\n");
- return jumpshot_handle_mode_sense(us, srb,
TRUE
);
+ return jumpshot_handle_mode_sense(us, srb,
1
);
}
if (srb->cmnd[0] == MODE_SENSE_10) {
US_DEBUGP("jumpshot_transport: MODE_SENSE_10 detected\n");
}
if (srb->cmnd[0] == MODE_SENSE_10) {
US_DEBUGP("jumpshot_transport: MODE_SENSE_10 detected\n");
- return jumpshot_handle_mode_sense(us, srb,
FALSE
);
+ return jumpshot_handle_mode_sense(us, srb,
0
);
}
if (srb->cmnd[0] == ALLOW_MEDIUM_REMOVAL) {
}
if (srb->cmnd[0] == ALLOW_MEDIUM_REMOVAL) {