Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61967
b: refs/heads/master
c: d20da3c
h: refs/heads/master
i:
  61965: 52c8859
  61963: feecc14
  61959: d29ae95
  61951: b28b183
v: v3
  • Loading branch information
S.Caglar Onur authored and Greg Kroah-Hartman committed Jul 20, 2007
1 parent bd776fc commit 1dd89eb
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e294531dc9f2c1f5291373dcdd5013c0cdcbdee2
refs/heads/master: d20da3c39b9d5b04f0258ba74643533268f56e30
56 changes: 28 additions & 28 deletions trunk/drivers/usb/storage/dpcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,43 +46,43 @@
*/
int dpcm_transport(struct scsi_cmnd *srb, struct us_data *us)
{
int ret;
int ret;

if(srb == NULL)
return USB_STOR_TRANSPORT_ERROR;
if (srb == NULL)
return USB_STOR_TRANSPORT_ERROR;

US_DEBUGP("dpcm_transport: LUN=%d\n", srb->device->lun);
US_DEBUGP("dpcm_transport: LUN=%d\n", srb->device->lun);

switch(srb->device->lun) {
case 0:
switch (srb->device->lun) {
case 0:

/*
* LUN 0 corresponds to the CompactFlash card reader.
*/
ret = usb_stor_CB_transport(srb, us);
break;
/*
* LUN 0 corresponds to the CompactFlash card reader.
*/
ret = usb_stor_CB_transport(srb, us);
break;

#ifdef CONFIG_USB_STORAGE_SDDR09
case 1:
case 1:

/*
* LUN 1 corresponds to the SmartMedia card reader.
*/
/*
* LUN 1 corresponds to the SmartMedia card reader.
*/

/*
* Set the LUN to 0 (just in case).
*/
srb->device->lun = 0; us->srb->device->lun = 0;
ret = sddr09_transport(srb, us);
srb->device->lun = 1; us->srb->device->lun = 1;
break;
/*
* Set the LUN to 0 (just in case).
*/
srb->device->lun = 0; us->srb->device->lun = 0;
ret = sddr09_transport(srb, us);
srb->device->lun = 1; us->srb->device->lun = 1;
break;

#endif

default:
US_DEBUGP("dpcm_transport: Invalid LUN %d\n", srb->device->lun);
ret = USB_STOR_TRANSPORT_ERROR;
break;
}
return ret;
default:
US_DEBUGP("dpcm_transport: Invalid LUN %d\n", srb->device->lun);
ret = USB_STOR_TRANSPORT_ERROR;
break;
}
return ret;
}

0 comments on commit 1dd89eb

Please sign in to comment.