mirror of
https://github.com/torvalds/linux.git
synced 2024-09-27 10:23:00 +00:00
[PATCH] libata: ata_dev_init_params() fixes
ata_dev_init_params() fixes: - Get the "heads" and "sectors" parameters from caller instead of implicitly from dev->id[]. - Return AC_ERR_INVALID instead of 0 if an invalid parameter is found Signed-off-by: Albert Lee <albertcc@tw.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
17efc5f723
commit
00b6f5e9e0
|
@ -62,7 +62,9 @@
|
||||||
#include "libata.h"
|
#include "libata.h"
|
||||||
|
|
||||||
static unsigned int ata_dev_init_params(struct ata_port *ap,
|
static unsigned int ata_dev_init_params(struct ata_port *ap,
|
||||||
struct ata_device *dev);
|
struct ata_device *dev,
|
||||||
|
u16 heads,
|
||||||
|
u16 sectors);
|
||||||
static void ata_set_mode(struct ata_port *ap);
|
static void ata_set_mode(struct ata_port *ap);
|
||||||
static unsigned int ata_dev_set_xfermode(struct ata_port *ap,
|
static unsigned int ata_dev_set_xfermode(struct ata_port *ap,
|
||||||
struct ata_device *dev);
|
struct ata_device *dev);
|
||||||
|
@ -1156,7 +1158,7 @@ static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev,
|
||||||
* Some drives were very specific about that exact sequence.
|
* Some drives were very specific about that exact sequence.
|
||||||
*/
|
*/
|
||||||
if (ata_id_major_version(id) < 4 || !ata_id_has_lba(id)) {
|
if (ata_id_major_version(id) < 4 || !ata_id_has_lba(id)) {
|
||||||
err_mask = ata_dev_init_params(ap, dev);
|
err_mask = ata_dev_init_params(ap, dev, id[3], id[6]);
|
||||||
if (err_mask) {
|
if (err_mask) {
|
||||||
rc = -EIO;
|
rc = -EIO;
|
||||||
reason = "INIT_DEV_PARAMS failed";
|
reason = "INIT_DEV_PARAMS failed";
|
||||||
|
@ -2748,16 +2750,16 @@ static unsigned int ata_dev_set_xfermode(struct ata_port *ap,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static unsigned int ata_dev_init_params(struct ata_port *ap,
|
static unsigned int ata_dev_init_params(struct ata_port *ap,
|
||||||
struct ata_device *dev)
|
struct ata_device *dev,
|
||||||
|
u16 heads,
|
||||||
|
u16 sectors)
|
||||||
{
|
{
|
||||||
struct ata_taskfile tf;
|
struct ata_taskfile tf;
|
||||||
unsigned int err_mask;
|
unsigned int err_mask;
|
||||||
u16 sectors = dev->id[6];
|
|
||||||
u16 heads = dev->id[3];
|
|
||||||
|
|
||||||
/* Number of sectors per track 1-255. Number of heads 1-16 */
|
/* Number of sectors per track 1-255. Number of heads 1-16 */
|
||||||
if (sectors < 1 || sectors > 255 || heads < 1 || heads > 16)
|
if (sectors < 1 || sectors > 255 || heads < 1 || heads > 16)
|
||||||
return 0;
|
return AC_ERR_INVALID;
|
||||||
|
|
||||||
/* set up init dev params taskfile */
|
/* set up init dev params taskfile */
|
||||||
DPRINTK("init dev params \n");
|
DPRINTK("init dev params \n");
|
||||||
|
|
Loading…
Reference in New Issue
Block a user