svn commit: r241402 - head/sys/dev/ata
Alexander Motin
mav at FreeBSD.org
Wed Oct 10 17:51:24 UTC 2012
Author: mav
Date: Wed Oct 10 17:51:23 2012
New Revision: 241402
URL: http://svn.freebsd.org/changeset/base/241402
Log:
Add checks for ata_sata_scr_read() return statuses. It is mostly to silence
Clang Static Analyzer warnings as errors there are usually unlikely.
Modified:
head/sys/dev/ata/ata-sata.c
Modified: head/sys/dev/ata/ata-sata.c
==============================================================================
--- head/sys/dev/ata/ata-sata.c Wed Oct 10 17:29:51 2012 (r241401)
+++ head/sys/dev/ata/ata-sata.c Wed Oct 10 17:51:23 2012 (r241402)
@@ -53,7 +53,8 @@ ata_sata_phy_check_events(device_t dev,
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,
/* 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");
More information about the svn-src-head
mailing list