From: James Simmons <jsimmons@infradead.org>

This make the logo handling code easier to read.  Merged the two code blocks
since they test for the exact same condition.