← Back to branch summary

~ubuntu-branches/debian/sid/libatasmart/sid

« back to all changes in this revision

Viewing changes to atasmart.c

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-03-25 07:38:36 UTC
  • Revision ID: package-import@ubuntu.com-20130325073836-xd81eeji99de2dn5
Tags: 0.19-2
https://launchpad.net/bugs/1013171
https://launchpad.net/bugs/1143495
* debian/local/apport-hook.py: Fix syntax to be Python 3 compatible.
  (LP: #1013171)
* debian/local/apport-hook.py: Include output of "udisksctl dump" from
  udisks2.
* Add 0001-Dont-test-undefined-bits.patch: Fix an incorrect IO error reading
  SMART status, by filtering out undefined bits. Thanks Phillip Susi.
  (LP: #1143495)
* Bump Standards-Version to 3.9.4, no changes necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
atasmart.c
925
925
        /* SAT/USB bridges truncate packets, so we only check for 4F,
926
926
         * not for 2C on those */
927
927
        if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x00C2U)) &&
928
 
            cmd[4] == htons(0x4F00U))
 
928
            (cmd[4] & htons(0xFF00U)) == htons(0x4F00U))
929
929
                *good = TRUE;
930
930
        else if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x002CU)) &&
931
 
                 cmd[4] == htons(0xF400U))
 
931
                 (cmd[4] & htons(0xFF00U)) == htons(0xF400U))
932
932
                *good = FALSE;
933
933
        else {
934
934
                errno = EIO;