diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 15:29:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 15:29:01 -0700 |
| commit | fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a (patch) | |
| tree | d1b2cc23c1b3cc9e73ea817ab0a7aa8d3391f320 /drivers/ide/ide-ioctls.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | ide: sgiioc4: Staticize ioc4_ide_attach_one() (diff) | |
| download | wireguard-linux-fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a.tar.xz wireguard-linux-fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE changes from David Miller:
"Mostly cleanups, and changes part of tree-wide adjustments, this code
is in deep freeze so that's pretty much what we expect these days"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: sgiioc4: Staticize ioc4_ide_attach_one()
ide: palm_bk3710: add missing __iomem annotation
ide: use dev_get_platdata()
ide-disk_proc: use macro to replace magic number
ide: replace strict_strtol() with kstrtol()
Diffstat (limited to 'drivers/ide/ide-ioctls.c')
| -rw-r--r-- | drivers/ide/ide-ioctls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c index 4d19eb9772a1..6233fa2cb8a9 100644 --- a/drivers/ide/ide-ioctls.c +++ b/drivers/ide/ide-ioctls.c @@ -141,8 +141,8 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg) if (args[0] == ATA_CMD_SMART) { tf->nsect = args[3]; tf->lbal = args[1]; - tf->lbam = 0x4f; - tf->lbah = 0xc2; + tf->lbam = ATA_SMART_LBAM_PASS; + tf->lbah = ATA_SMART_LBAH_PASS; cmd.valid.out.tf = IDE_VALID_OUT_TF; cmd.valid.in.tf = IDE_VALID_NSECT; } else { |