diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/usb/storage/ene_ub6250.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/usb/storage/ene_ub6250.c')
| -rw-r--r-- | drivers/usb/storage/ene_ub6250.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c index 08e03745e25..0e5aafda453 100644 --- a/drivers/usb/storage/ene_ub6250.c +++ b/drivers/usb/storage/ene_ub6250.c | |||
| @@ -562,7 +562,7 @@ static int ene_sd_init(struct us_data *us) | |||
| 562 | 562 | ||
| 563 | result = ene_send_scsi_cmd(us, FDIR_READ, NULL, 0); | 563 | result = ene_send_scsi_cmd(us, FDIR_READ, NULL, 0); |
| 564 | if (result != USB_STOR_XFER_GOOD) { | 564 | if (result != USB_STOR_XFER_GOOD) { |
| 565 | US_DEBUGP("Exection SD Init Code Fail !!\n"); | 565 | US_DEBUGP("Execution SD Init Code Fail !!\n"); |
| 566 | return USB_STOR_TRANSPORT_ERROR; | 566 | return USB_STOR_TRANSPORT_ERROR; |
| 567 | } | 567 | } |
| 568 | 568 | ||
| @@ -581,7 +581,7 @@ static int ene_sd_init(struct us_data *us) | |||
| 581 | 581 | ||
| 582 | result = ene_send_scsi_cmd(us, FDIR_READ, &buf, 0); | 582 | result = ene_send_scsi_cmd(us, FDIR_READ, &buf, 0); |
| 583 | if (result != USB_STOR_XFER_GOOD) { | 583 | if (result != USB_STOR_XFER_GOOD) { |
| 584 | US_DEBUGP("Exection SD Init Code Fail !!\n"); | 584 | US_DEBUGP("Execution SD Init Code Fail !!\n"); |
| 585 | return USB_STOR_TRANSPORT_ERROR; | 585 | return USB_STOR_TRANSPORT_ERROR; |
| 586 | } | 586 | } |
| 587 | 587 | ||