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 'master'
[pandora-kernel.git]
/
drivers
/
scsi
/
ahci.c
diff --git
a/drivers/scsi/ahci.c
b/drivers/scsi/ahci.c
index
b4f8fb1
..
20fc084
100644
(file)
--- a/
drivers/scsi/ahci.c
+++ b/
drivers/scsi/ahci.c
@@
-48,7
+48,7
@@
#include <asm/io.h>
#define DRV_NAME "ahci"
#include <asm/io.h>
#define DRV_NAME "ahci"
-#define DRV_VERSION "1.
2
"
+#define DRV_VERSION "1.
3
"
enum {
enum {
@@
-548,6
+548,12
@@
static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
DPRINTK("ENTER\n");
DPRINTK("ENTER\n");
+ if (!sata_dev_present(ap)) {
+ DPRINTK("PHY reports no device\n");
+ *class = ATA_DEV_NONE;
+ return 0;
+ }
+
/* prepare for SRST (AHCI-1.1 10.4.1) */
rc = ahci_stop_engine(ap);
if (rc) {
/* prepare for SRST (AHCI-1.1 10.4.1) */
rc = ahci_stop_engine(ap);
if (rc) {