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 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
[pandora-kernel.git]
/
drivers
/
scsi
/
libata-core.c
diff --git
a/drivers/scsi/libata-core.c
b/drivers/scsi/libata-core.c
index
16fc2dd
..
73dd6c8
100644
(file)
--- a/
drivers/scsi/libata-core.c
+++ b/
drivers/scsi/libata-core.c
@@
-2746,7
+2746,7
@@
int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol)))
return rc;
- scontrol = (scontrol & 0x0f0) | 0x30
2
;
+ scontrol = (scontrol & 0x0f0) | 0x30
4
;
if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol)))
return rc;