| Message ID | 1390878454-4329-1-git-send-email-stewartb2@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Mon, Jan 27, 2014 at 09:07:34PM -0600, Brandon Stewart wrote: > I corrected several coding errors. > > Signed-off-by: Brandon Stewart <stewartb2@gmail.com> > --- > drivers/macintosh/adb.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c > index 53611de..dd3f49a 100644 > --- a/drivers/macintosh/adb.c > +++ b/drivers/macintosh/adb.c > @@ -623,7 +623,7 @@ do_adb_query(struct adb_request *req) > { > int ret = -EINVAL; > > - switch(req->data[1]) { > + switch (req->data[1]) { > case ADB_QUERY_GETDEVINFO: > if (req->nbytes < 3) > break; > @@ -792,8 +792,9 @@ static ssize_t adb_write(struct file *file, const char __user *buf, > } > /* Special case for ADB_BUSRESET request, all others are sent to > the controller */ > - else if ((req->data[0] == ADB_PACKET) && (count > 1) > - && (req->data[1] == ADB_BUSRESET)) { > + else if (req->data[0] == ADB_PACKET && > + req->data[1] == ADB_BUSRESET && > + count > 1) { Is this re-ordering safe? Isn't 'count > 1' notionally indicating whether req->data[1] exists to be tested in the first place? On the other hand there's a check at the top of the routine that returns if count < 2, so maybe the check here should be removed altogether (along with one a few lines above)?
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 53611de..dd3f49a 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c @@ -623,7 +623,7 @@ do_adb_query(struct adb_request *req) { int ret = -EINVAL; - switch(req->data[1]) { + switch (req->data[1]) { case ADB_QUERY_GETDEVINFO: if (req->nbytes < 3) break; @@ -792,8 +792,9 @@ static ssize_t adb_write(struct file *file, const char __user *buf, } /* Special case for ADB_BUSRESET request, all others are sent to the controller */ - else if ((req->data[0] == ADB_PACKET) && (count > 1) - && (req->data[1] == ADB_BUSRESET)) { + else if (req->data[0] == ADB_PACKET && + req->data[1] == ADB_BUSRESET && + count > 1) { ret = do_adb_reset_bus(); up(&adb_probe_mutex); atomic_dec(&state->n_pending);
I corrected several coding errors. Signed-off-by: Brandon Stewart <stewartb2@gmail.com> --- drivers/macintosh/adb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)