diff options
| author | huajun li <huajun.li.lee@gmail.com> | 2011-03-04 10:56:18 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 13:40:59 -0800 |
| commit | 41e568d14ec0aca1b2bb19563517aad3b06d6805 (patch) | |
| tree | e1c9e5a384bb0ae1909ab373b13d127ef0f0b0de /drivers/staging/keucr/transport.c | |
| parent | 153775d94899503f5f66baaa9751a43c74d4f371 (diff) | |
| download | op-kernel-dev-41e568d14ec0aca1b2bb19563517aad3b06d6805.zip op-kernel-dev-41e568d14ec0aca1b2bb19563517aad3b06d6805.tar.gz | |
Staging: Merge ENE UB6250 SD card codes from keucr to drivers/usb/storage
The usb portion of this driver can now go into drivers/usb/storage.
This leaves the non-usb portion of the code still in staging.
Signed-off-by: Huajun Li <huajun.li.lee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/keucr/transport.c')
| -rw-r--r-- | drivers/staging/keucr/transport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c index 111160c..a53402f 100644 --- a/drivers/staging/keucr/transport.c +++ b/drivers/staging/keucr/transport.c @@ -413,7 +413,7 @@ void ENE_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) usb_stor_print_cmd(srb); /* send the command to the transport layer */ scsi_set_resid(srb, 0); - if ( !(us->SD_Status.Ready || us->MS_Status.Ready || us->SM_Status.Ready) ) + if (!(us->MS_Status.Ready || us->SM_Status.Ready)) result = ENE_InitMedia(us); if (us->Power_IsResum == true) { @@ -421,7 +421,6 @@ void ENE_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) us->Power_IsResum = false; } - if (us->SD_Status.Ready) result = SD_SCSIIrp(us, srb); if (us->MS_Status.Ready) result = MS_SCSIIrp(us, srb); if (us->SM_Status.Ready) result = SM_SCSIIrp(us, srb); |
