d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add checks for ata_sata_scr_read() return statuses. It is mostly to silence

Browse Source 
Clang Static Analyzer warnings as errors there are usually unlikely.
This commit is contained in:
mav 2012-10-10 17:51:23 +00:00
parent 6764c20438
commit 33a3526a8c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ata/ata-sata.c
View File

@ -53,7 +53,8 @@ ata_sata_phy_check_events(device_t dev, int port)
struct ata_channel *ch = device_get_softc(dev);
u_int32_t error, status;
ata_sata_scr_read(ch, port, ATA_SERROR, &error);
if (ata_sata_scr_read(ch, port, ATA_SERROR, &error))
return;
/* Check that SError value is sane. */
if (error == 0xffffffff)
@ -66,8 +67,9 @@ ata_sata_phy_check_events(device_t dev, int port)
/* if we have a connection event deal with it */
if ((error & ATA_SE_PHY_CHANGED) && (ch->pm_level == 0)) {
if (bootverbose) {
ata_sata_scr_read(ch, port, ATA_SSTATUS, &status);
if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) &&
if (ata_sata_scr_read(ch, port, ATA_SSTATUS, &status)) {
device_printf(dev, "PHYRDY change\n");
} else if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) &&
((status & ATA_SS_SPD_MASK) != ATA_SS_SPD_NO_SPEED) &&
((status & ATA_SS_IPM_MASK) == ATA_SS_IPM_ACTIVE)) {
device_printf(dev, "CONNECT requested\n");